puppet 4.8.2-x86-mingw32 → 4.9.0-x86-mingw32

data/lib/puppet/plugins/data_providers/registry.rb

@@ -1,4 +1,6 @@
+# TODO: API 5.0, remove this module
 # @api private
+# @deprecated
 module Puppet::Plugins::DataProviders
   class Registry
     def self.register_extensions(extensions)
@@ -38,47 +40,11 @@ module Puppet::Plugins::DataProviders
         to_instance(ENV_DATA_PROVIDERS_TYPE)
       end
 
-      default_bindings.bind do
-        name('function')
-        in_multibind(ENV_DATA_PROVIDERS_KEY)
-        to_instance('Puppet::DataProviders::FunctionEnvDataProvider')
-      end
-
-      default_bindings.bind do
-        name('hiera')
-        in_multibind(ENV_DATA_PROVIDERS_KEY)
-        to_instance('Puppet::DataProviders::HieraEnvDataProvider')
-      end
-
       default_bindings.bind do
         name('none')
         in_multibind(MODULE_DATA_PROVIDERS_KEY)
         to_instance(MODULE_DATA_PROVIDERS_TYPE)
       end
-
-      default_bindings.bind do
-        name('function')
-        in_multibind(MODULE_DATA_PROVIDERS_KEY)
-        to_instance('Puppet::DataProviders::FunctionModuleDataProvider')
-      end
-
-      default_bindings.bind do
-        name('hiera')
-        in_multibind(MODULE_DATA_PROVIDERS_KEY)
-        to_instance('Puppet::DataProviders::HieraModuleDataProvider')
-      end
-
-      default_bindings.bind do
-        name('json')
-        in_multibind(PATH_BASED_DATA_PROVIDER_FACTORIES_KEY)
-        to_instance('Puppet::DataProviders::JsonDataProviderFactory')
-      end
-
-      default_bindings.bind do
-        name('yaml')
-        in_multibind(PATH_BASED_DATA_PROVIDER_FACTORIES_KEY)
-        to_instance('Puppet::DataProviders::YamlDataProviderFactory')
-      end
     end
   end
 end

data/lib/puppet/pops.rb

@@ -10,11 +10,14 @@ module Puppet
   #
   # @api public
   module Pops
-    EMPTY_HASH = {}.freeze
+     EMPTY_HASH = {}.freeze
     EMPTY_ARRAY = [].freeze
     EMPTY_STRING = ''.freeze
 
-    require 'semantic'
+    DOUBLE_COLON = '::'.freeze
+    USCORE = '_'.freeze
+
+    require 'semantic_puppet'
 
     require 'puppet/pops/patterns'
     require 'puppet/pops/utils'
@@ -33,12 +36,6 @@ module Puppet
     require 'puppet/pops/label_provider'
     require 'puppet/pops/validation'
     require 'puppet/pops/issue_reporter'
-    require 'puppet/pops/lookup'
-    require 'puppet/pops/lookup/interpolation'
-    require 'puppet/pops/lookup/invocation'
-    require 'puppet/pops/lookup/sub_lookup'
-    require 'puppet/pops/lookup/explainer'
-
     require 'puppet/pops/model/model'
 
     require 'puppet/pops/time/timespan'
@@ -47,7 +44,7 @@ module Puppet
     # (the Types module initializes itself)
     require 'puppet/pops/types/types'
     require 'puppet/pops/types/string_converter'
-    require 'puppet/pops/lookup/context'
+    require 'puppet/pops/lookup'
 
     require 'puppet/pops/merge_strategy'
 

data/lib/puppet/pops/adaptable.rb

@@ -176,9 +176,6 @@ module Adaptable
       adapter
     end
 
-    DOUBLE_COLON = '::'
-    USCORE = '_'
-
     # Returns a suitable instance variable name given a class name.
     # The returned string is the fully qualified name of a class with '::' replaced by '_' since
     # '::' is not allowed in an instance variable name.

data/lib/puppet/pops/binder/producers.rb

@@ -722,7 +722,7 @@ module Producers
       end
 
       if uniq || flatten || conflict_resolution.to_s == 'append'
-        etype = binding.type.element_type
+        etype = binding.type.value_type
         unless etype.class == Types::PDataType || etype.is_a?(Types::PArrayType)
           detail = []
           detail << ":uniq" if uniq
@@ -818,10 +818,10 @@ module Producers
         raise ArgumentError, "Entry contributing to multibind hash with id '#{binding.id}' must have a name."
       end
 
-      unless tc.instance?(binding.type.element_type, value)
+      unless tc.instance?(binding.type.value_type, value)
         raise ArgumentError, ["Type Error: value contribution to #{binding.name}['#{key}'] ",
           "is incompatible, ",
-          type_error_detail(binding.type.element_type, value)].join()
+          type_error_detail(binding.type.value_type, value)].join()
       end
     end
   end

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

@@ -158,7 +158,7 @@ class AccessOperator
 
   def access_PSemVerType(o, scope, keys)
     keys.flatten!
-    assert_keys(keys, o, 1, Float::INFINITY, String, Semantic::VersionRange)
+    assert_keys(keys, o, 1, Float::INFINITY, String, SemanticPuppet::VersionRange)
     Types::TypeFactory.sem_ver(*keys)
   end
 
@@ -284,7 +284,7 @@ class AccessOperator
       type = keys[0]
       unless type.is_a?(Types::PAnyType)
         if type.is_a?(String)
-          type = Types::TypeFactory.string(nil, type)
+          type = Types::TypeFactory.string(type)
         else
           fail(Issues::BAD_TYPE_SLICE_TYPE, @semantic.keys[0], {:base_type => 'Optional-Type', :actual => type.class})
         end
@@ -335,7 +335,7 @@ class AccessOperator
       type = keys[0]
       case type
       when String
-        type = Types::TypeFactory.string(nil, type)
+        type = Types::TypeFactory.string(type)
       when Types::PAnyType
         type = nil if type.class == Types::PAnyType
       else
@@ -460,7 +460,7 @@ class AccessOperator
       fail(Issues::BAD_TYPE_SLICE_ARITY, @semantic,
         {:base_type => 'Collection-Type', :min => 1, :max => 2, :actual => keys.size})
     end
-    Types::PCollectionType.new(nil, size_t)
+    Types::PCollectionType.new(size_t)
   end
 
   # An Array can create a new Array type. It is not possible to create a collection of Array types.

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

@@ -311,7 +311,7 @@ class Closure < CallableSignature
 
     parameters.each do |param|
       arg_type, param_range = create_param_type(param, closure_scope)
-      key_type = type_factory.string(nil, param.name.to_s)
+      key_type = type_factory.string(param.name.to_s)
       key_type = type_factory.optional(key_type) unless param.value.nil?
       members[key_type] = arg_type
     end

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

@@ -103,7 +103,7 @@ class CompareOperator
   end
 
   def cmp_Version(a, b)
-    raise ArgumentError.new('Versions not comparable to non Versions') unless b.is_a?(Semantic::Version)
+    raise ArgumentError.new('Versions not comparable to non Versions') unless b.is_a?(SemanticPuppet::Version)
     a <=> b
   end
 
@@ -172,7 +172,7 @@ class CompareOperator
       # Always set match data, a "not found" should not keep old match data visible
       set_match_data(matched, scope) # creates ephemeral
       return !!matched
-    when String, Semantic::Version
+    when String, SemanticPuppet::Version
       a.any? { |element| match(b, element, scope) }
     when Types::PAnyType
       a.each {|element| return true if b.instance?(element) }
@@ -206,11 +206,11 @@ class CompareOperator
 
   # Matches against semvers and strings
   def match_Version(version, left, scope)
-    if left.is_a?(Semantic::Version)
+    if left.is_a?(SemanticPuppet::Version)
       version == left
     elsif left.is_a? String
       begin
-        version == Semantic::Version.parse(left)
+        version == SemanticPuppet::Version.parse(left)
       rescue ArgumentError
         false
       end

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

@@ -570,7 +570,7 @@ class EvaluatorImpl
       return o.operator == :'=~' ? !!matched : !matched
     end
 
-    if pattern.is_a?(Semantic::VersionRange)
+    if pattern.is_a?(SemanticPuppet::VersionRange)
       # evaluate if range includes version
       matched = Types::PSemVerRangeType.include?(pattern, left)
       return o.operator == :'=~' ? matched : !matched

data/lib/puppet/pops/issues.rb

@@ -619,6 +619,10 @@ module Issues
     "The key '#{key}' is declared more than once"
   end
 
+  DUPLICATE_DEFAULT = issue :DUPLICATE_DEFAULT, :container do
+    "This #{label.label(container)} already has a 'default' entry - this is a duplicate"
+  end
+
   RESERVED_PARAMETER = hard_issue :RESERVED_PARAMETER, :container, :param_name do
     "The parameter $#{param_name} redefines a built in parameter in #{label.the(container)}"
   end

data/lib/puppet/pops/label_provider.rb

@@ -40,6 +40,20 @@ module Puppet::Pops::LabelProvider
     count == 1 ? text : "#{text}s"
   end
 
+  # Combines several strings using commas and a final conjunction
+  def combine_strings(strings, conjunction = 'or')
+    case strings.size
+    when 0
+      ''
+    when 1
+      strings[0]
+    when 2
+      "#{strings[0]} #{conjunction} #{strings[1]}"
+    else
+      "#{strings[0...-1].join(', ')}, #{conjunction} #{strings.last}"
+    end
+  end
+
   # Produces an *indefinite article* (a/an) for the given text ('a' if
   # it starts with a vowel) This is obviously flawed in the general
   # sense as may labels have punctuation at the start and this method

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

@@ -109,7 +109,9 @@ module Puppet::Pops::Loader::LoaderPaths
     def effective_path(typed_name, start_index_in_name)
       # Puppet name to path always skips the name-space as that is part of the generic path
       # i.e. <module>/mymodule/functions/foo.pp is the function mymodule::foo
-      "#{File.join(generic_path, typed_name.name_parts[ 1..-1 ])}.pp"
+      parts = typed_name.name_parts
+      parts = parts[start_index_in_name..-1] if parts.size > 1
+      "#{File.join(generic_path, parts)}.pp"
     end
   end
 

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

@@ -21,6 +21,8 @@ module Loader
 # @api private
 #
 module ModuleLoaders
+  ENVIRONMENT = 'environment'.freeze
+
   def self.system_loader_from(parent_loader, loaders)
     # Puppet system may be installed in a fixed location via RPM, installed as a Gem, via source etc.
     # The only way to find this across the different ways puppet can be installed is
@@ -37,6 +39,15 @@ module ModuleLoaders
                                                        )
   end
 
+  def self.environment_loader_from(parent_loader, loaders, env_path)
+    ModuleLoaders::FileBased.new(parent_loader,
+      loaders,
+      ENVIRONMENT,
+      File.join(env_path, 'lib'),
+      ENVIRONMENT
+    )
+  end
+
   def self.module_loader_from(parent_loader, loaders, module_name, module_path)
     ModuleLoaders::FileBased.new(parent_loader,
                                                        loaders,
@@ -107,7 +118,6 @@ module ModuleLoaders
       return nil unless typed_name.name_authority == Pcore::RUNTIME_NAME_AUTHORITY
 
       # Assume it is a global name, and that all parts of the name should be used when looking up
-      name_part_index = 0
       name_parts = typed_name.name_parts
 
       # Certain types and names can be disqualified up front
@@ -119,10 +129,6 @@ module ModuleLoaders
         # ok since such a "module" cannot have namespaced content).
         #
         return nil unless name_parts[0] == module_name
-
-        # Skip the first part of the name when computing the path since the path already contains the name of the
-        # module
-        name_part_index = 1
       else
         # The name is in the global name space.
 
@@ -144,7 +150,7 @@ module ModuleLoaders
       # Find the file to instantiate, and instantiate the entity if file is found
       origin = nil
       if (smart_path = smart_paths.effective_paths(typed_name.type).find do |sp|
-          origin = sp.effective_path(typed_name, name_part_index)
+          origin = sp.effective_path(typed_name, global? ? 0 : 1)
           existing_path(origin)
         end)
         value = smart_path.instantiator.create(self, typed_name, origin, get_contents(origin))
@@ -200,12 +206,20 @@ module ModuleLoaders
       raise NotImplementedError.new
     end
 
+    # Answers the question if this loader represents a global component (true for resource type loader and environment loader)
+    #
+    # @return [Boolean] `true` if this loader represents a global component
+    #
+    def global?
+      module_name.nil? || module_name == ENVIRONMENT
+    end
+
     # Produces the private loader for the module. If this module is not already resolved, this will trigger resolution
     #
     def private_loader
       # The system loader has a nil module_name and it does not have a private_loader as there are no functions
       # that can only by called by puppet runtime - if so, it acts as the private loader directly.
-      @private_loader ||= (module_name.nil? || module_name == 'environment' ? self : @loaders.private_loader_for_module(module_name))
+      @private_loader ||= (global? ? self : @loaders.private_loader_for_module(module_name))
     end
   end
 

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

@@ -4,8 +4,6 @@ module Loader
 #
 # @api public
 class TypedName
-  DOUBLE_COLON = '::'.freeze
-
   attr_reader :hash
   attr_reader :type
   attr_reader :name_authority

data/lib/puppet/pops/loaders.rb

@@ -17,16 +17,16 @@ class Loaders
   attr_reader :private_environment_loader
   attr_reader :implementation_registry
 
-  def self.new(environment)
+  def self.new(environment, for_agent = false)
     obj = environment.loaders
     if obj.nil?
       obj = self.allocate
-      obj.send(:initialize, environment)
+      obj.send(:initialize, environment, for_agent)
     end
     obj
   end
 
-  def initialize(environment)
+  def initialize(environment, for_agent)
     # Protect against environment havoc
     raise ArgumentError.new("Attempt to redefine already initialized loaders for environment") unless environment.loaders.nil?
     environment.loaders = self
@@ -47,12 +47,16 @@ class Loaders
     #    concept of environment the same way as when running as a master (except when doing apply).
     #    The creation mechanisms should probably differ between the two.
     #
-    @private_environment_loader = create_environment_loader(environment)
+    @private_environment_loader = if for_agent
+      add_loader_by_name(Loader::SimpleEnvironmentLoader.new(@puppet_system_loader, 'agent environment'))
+    else
+      create_environment_loader(environment)
+    end
 
     # 3. The implementation registry maintains mappings between Puppet types and Runtime types for
     #    the current environment
     @implementation_registry = Types::ImplementationRegistry.new(@private_environment_loader)
-    Pcore.init(@puppet_system_loader, @implementation_registry)
+    Pcore.init(@puppet_system_loader, @implementation_registry, for_agent)
 
     # 4. module loaders are set up from the create_environment_loader, they register themselves
   end
@@ -106,15 +110,30 @@ class Loaders
   # @api private
   def self.register_runtime3_type(name, origin)
     loaders = Puppet.lookup(:loaders) { nil }
-    unless loaders.nil?
-      name = name.to_s
-      caps_name = Types::TypeFormatter.singleton.capitalize_segments(name)
-      typed_name = Loader::TypedName.new(:type, name.downcase)
-      loaders.runtime3_type_loader.set_entry(typed_name, Types::PResourceType.new(caps_name), origin)
-    end
+    return nil if loaders.nil?
+
+    rt3_loader = loaders.runtime3_type_loader
+    return nil if rt3_loader.nil?
+
+    name = name.to_s
+    caps_name = Types::TypeFormatter.singleton.capitalize_segments(name)
+    typed_name = Loader::TypedName.new(:type, name.downcase)
+    rt3_loader.set_entry(typed_name, Types::PResourceType.new(caps_name), origin)
     nil
   end
 
+  # Finds a loader to use when deserializing a catalog and then subsequenlty use user
+  # defined types found in that catalog.
+  #
+  def self.catalog_loader
+    loaders = Puppet.lookup(:loaders) { nil }
+    if loaders.nil?
+      loaders = Loaders.new(Puppet.lookup(:current_environment), true)
+      Puppet.push_context(:loaders => loaders)
+    end
+    loaders.find_loader(nil)
+  end
+
   # Finds the `Loaders` instance by looking up the :loaders in the global Puppet context
   #
   # @return [Loaders] the loaders instance
@@ -241,7 +260,7 @@ class Loaders
       loader = add_loader_by_name(Loader::SimpleEnvironmentLoader.new(@runtime3_type_loader, loader_name))
     else
       # View the environment as a module to allow loading from it - this module is always called 'environment'
-      loader = Loader::ModuleLoaders.module_loader_from(@runtime3_type_loader, self, 'environment', env_path)
+      loader = Loader::ModuleLoaders.environment_loader_from(@runtime3_type_loader, self, env_path)
     end
 
     # An environment has a module path even if it has a null loader

data/lib/puppet/pops/lookup.rb

@@ -20,7 +20,6 @@ module Lookup
   # @return [Object] The found value
   #
   def self.lookup(name, value_type, default_value, has_default, merge, lookup_invocation)
-    value_type = Types::PDataType::DEFAULT if value_type.nil?
     names = name.is_a?(Array) ? name : [name]
 
     # find first name that yields a non-nil result and wrap it in a two element array
@@ -74,11 +73,11 @@ module Lookup
 
   # @api private
   def self.search_and_merge(name, lookup_invocation, merge)
-    return Puppet::DataProviders.lookup_adapter(lookup_invocation).lookup(name, lookup_invocation, merge)
+    lookup_invocation.lookup_adapter.lookup(name, lookup_invocation, merge)
   end
 
   def self.assert_type(subject, type, value)
-    Types::TypeAsserter.assert_instance_of(subject, type, value)
+    type ? Types::TypeAsserter.assert_instance_of(subject, type, value) : value
   end
   private_class_method :assert_type
 
@@ -89,3 +88,5 @@ module Lookup
   private_class_method :fail_lookup
 end
 end
+
+require_relative 'lookup/lookup_adapter'