puppet 4.5.0 → 4.5.1

data/ext/README.environment

@@ -5,4 +5,4 @@ modules that are installed globally (normally in /etc/puppetlabs/code/modules) f
 puppet master.
 
 For more information see
-https://docs.puppetlabs.com/puppet/latest/reference/environments.html
+https://docs.puppet.com/puppet/latest/reference/environments.html

data/lib/puppet/data_providers.rb

@@ -25,6 +25,6 @@ module Puppet::DataProviders
 
   def self.lookup_adapter(lookup_invocation)
     assert_loaded()
-    LookupAdapter.adapt(lookup_invocation.scope.environment)
+    LookupAdapter.adapt(lookup_invocation.scope.compiler)
   end
 end

data/lib/puppet/data_providers/lookup_adapter.rb

@@ -1,6 +1,8 @@
-# A LookupAdapter is a specialized DataAdapter that uses its hash to store module providers. It also remembers the environment
-# that it is attached to and maintains a cache of _lookup options_ retrieved from its data providers.
+# A LookupAdapter is a specialized DataAdapter that uses its hash to store module providers. It also remembers the compiler
+# that it is attached to and maintains a cache of _lookup options_ retrieved from the data providers associated with the
+# compiler's environment.
 #
+# @api private
 class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
 
   LOOKUP_OPTIONS = Puppet::Pops::Lookup::LOOKUP_OPTIONS
@@ -9,13 +11,13 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
   HASH = 'hash'.freeze
   MERGE = 'merge'.freeze
 
-  def self.create_adapter(env)
-    new(env)
+  def self.create_adapter(compiler)
+    new(compiler)
   end
 
-  def initialize(env)
+  def initialize(compiler)
     super()
-    @env = env
+    @compiler = compiler
     @lookup_options = {}
   end
 
@@ -77,7 +79,7 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     lookup_invocation.with(:global, terminus) do
       catch(:no_such_key) do
         return lookup_invocation.report_found(name, Puppet::DataBinding.indirection.find(name,
-            { :environment => @env, :variables => lookup_invocation.scope, :merge => merge_strategy }))
+            { :environment => environment, :variables => lookup_invocation.scope, :merge => merge_strategy }))
       end
       lookup_invocation.report_not_found(name)
       throw :no_such_key
@@ -101,7 +103,7 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     throw :no_such_key if module_name.nil?
 
     lookup_invocation.with(:module, module_name) do
-      if @env.module(module_name).nil?
+      if environment.module(module_name).nil?
         lookup_invocation.report_module_not_found
         throw :no_such_key
       end
@@ -157,7 +159,7 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     meta_invocation = Puppet::Pops::Lookup::Invocation.new(lookup_invocation.scope)
     meta_invocation.top_key = lookup_invocation.top_key
     env_opts = env_lookup_options(meta_invocation, merge_strategy)
-    unless module_name.nil? || @env.module(module_name).nil?
+    unless module_name.nil? || environment.module(module_name).nil?
       catch(:no_such_key) do
         meta_invocation.module_name = module_name
         options = module_provider(module_name).lookup(LOOKUP_OPTIONS, meta_invocation, merge_strategy)
@@ -168,7 +170,7 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     env_opts
   end
 
-  # Retrieve and cache lookup options specific to the environment that this adapter is attached to (i.e. a merge
+  # Retrieve and cache lookup options specific to the environment of the compiler that this adapter is attached to (i.e. a merge
   # of global and environment lookup options).
   def env_lookup_options(meta_invocation, merge_strategy)
     if !instance_variable_defined?(:@env_lookup_options)
@@ -214,9 +216,9 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     service = injector.lookup(nil, service_type, service_name)
     provider = service[provider_name]
     unless provider
-      raise Puppet::Error.new("Environment '#{@env.name}', cannot find module_data_provider '#{provider_name}'")
+      raise Puppet::Error.new("Environment '#{environment.name}', cannot find module_data_provider '#{provider_name}'")
     end
-    # Provider is configured per module but cached using environment life cycle so it must be cloned
+    # Provider is configured per module but cached using compiler life cycle so it must be cloned
     provider.clone
   end
 
@@ -227,7 +229,7 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     return EnvironmentDataProvider.new() unless injector
 
     # Get the name of the data provider from the environment's configuration and find the bound implementation
-    provider_name = @env.configuration.environment_data_provider
+    provider_name = environment.configuration.environment_data_provider
     service_type = Registry.hash_of_environment_data_providers
     service_name = ENV_DATA_PROVIDERS_KEY
 
@@ -235,7 +237,7 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     service = injector.lookup(nil, service_type, service_name)
     provider = service[provider_name]
     unless provider
-      raise Puppet::Error.new("Environment '#{@env.name}', cannot find environment_data_provider '#{provider_name}'")
+      raise Puppet::Error.new("Environment '#{environment.name}', cannot find environment_data_provider '#{provider_name}'")
     end
     provider
   end
@@ -244,4 +246,9 @@ class Puppet::DataProviders::LookupAdapter < Puppet::DataProviders::DataAdapter
     qual_index = name.index('::')
     qual_index.nil? ? nil : name[0..qual_index-1]
   end
+
+  # @return [Puppet::Node::Environment] the environment of the compiler that this adapter is associated with
+  def environment
+    @compiler.environment
+  end
 end

data/lib/puppet/defaults.rb

@@ -308,7 +308,7 @@ module Puppet
 
         This setting must have a value set to enable **directory environments.** The
         recommended value is `$codedir/environments`. For more details, see
-        https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        <https://docs.puppet.com/puppet/latest/reference/environments.html>",
       :type    => :path,
     },
     :always_cache_features => {
@@ -1077,7 +1077,7 @@ EOT
         directory environments instead. If you need to use something other than the
         environment's `manifests` directory as the main manifest, you can set
         `manifest` in environment.conf. For more info, see
-        https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        <https://docs.puppet.com/puppet/latest/reference/environments.html>",
     },
     :modulepath => {
       :default => "",
@@ -1091,7 +1091,7 @@ EOT
         directory environments instead. If you need to use something other than the
         default modulepath of `<ACTIVE ENVIRONMENT'S MODULES DIR>:$basemodulepath`,
         you can set `modulepath` in environment.conf. For more info, see
-        https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        <https://docs.puppet.com/puppet/latest/reference/environments.html>",
     },
     :config_version => {
       :default    => "",
@@ -1103,7 +1103,7 @@ EOT
       Setting a global value for config_version in puppet.conf is not allowed
       (but it can be overridden from the commandline). Please set a
       per-environment value in environment.conf instead. For more info, see
-      https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+      <https://docs.puppet.com/puppet/latest/reference/environments.html>",
     }
   )
 
@@ -1215,7 +1215,7 @@ EOT
         These are the modules that will be used by _all_ environments. Note that
         the `modules` directory of the active environment will have priority over
         any global directories. For more info, see
-        https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        <https://docs.puppet.com/puppet/latest/reference/environments.html>",
     },
     :ssl_client_header => {
       :default    => "HTTP_X_CLIENT_DN",

data/lib/puppet/parser/compiler.rb

@@ -27,7 +27,7 @@ class Puppet::Parser::Compiler
       errors.each { |e| Puppet.err(e) } if errors.size > 1
       errmsg = [
         "Compilation has been halted because: #{errors.first}",
-        "For more information, see https://docs.puppetlabs.com/puppet/latest/reference/environments.html",
+        "For more information, see https://docs.puppet.com/puppet/latest/reference/environments.html",
       ]
       raise(Puppet::Error, errmsg.join(' '))
     end

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

@@ -82,7 +82,7 @@ module Runtime3Support
       # Must convert :undef back to nil - this can happen when an undefined variable is used in a
       # parameter's default value expression - there nil must be :undef to work with the rest of 3x.
       # Now that the value comes back to 4x it is changed to nil.
-      return :undef == x ? nil : x
+      return :undef.equal?(x) ? nil : x
     }
     # It is always ok to reference numeric variables even if they are not assigned. They are always undef
     # if not set by a match expression.

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

@@ -745,6 +745,34 @@ module Types
       end
     end
 
+    def describe_PArrayType(expected, actual, path)
+      descriptions = []
+      element_type = expected.element_type || PAnyType::DEFAULT
+      if actual.is_a?(PTupleType)
+        types = actual.types
+        expected_size = expected.size_type || PCollectionType::DEFAULT_SIZE
+        actual_size = actual.size_type || PIntegerType.new(types.size, types.size)
+        if expected_size.assignable?(actual_size)
+          types.each_with_index do |type, idx|
+            descriptions.concat(describe(element_type, type, path + [ArrayPathElement.new(idx)])) unless element_type.assignable?(type)
+          end
+        else
+          descriptions << SizeMismatch.new(path, expected_size, actual_size)
+        end
+      elsif actual.is_a?(PArrayType)
+        expected_size = expected.size_type
+        actual_size = actual.size_type || PCollectionType::DEFAULT_SIZE
+        if expected_size.nil? || expected_size.assignable?(actual_size)
+          descriptions << TypeMismatch.new(path, expected, actual)
+        else
+          descriptions << SizeMismatch.new(path, expected_size, actual_size)
+        end
+      else
+        descriptions << TypeMismatch.new(path, expected, actual)
+      end
+      descriptions
+    end
+
     def describe_PHashType(expected, actual, path)
       descriptions = []
       key_type = expected.key_type || PAnyType::DEFAULT
@@ -761,6 +789,14 @@ module Types
         else
           descriptions << SizeMismatch.new(path, expected_size, actual_size)
         end
+      elsif actual.is_a?(PHashType)
+        expected_size = expected.size_type
+        actual_size = actual.size_type || PCollectionType::DEFAULT_SIZE
+        if expected_size.nil? || expected_size.assignable?(actual_size)
+          descriptions << TypeMismatch.new(path, expected, actual)
+        else
+          descriptions << SizeMismatch.new(path, expected_size, actual_size)
+        end
       else
         descriptions << TypeMismatch.new(path, expected, actual)
       end
@@ -915,6 +951,8 @@ module Types
           describe_PHashType(expected, actual, path)
         when PTupleType
           describe_PTupleType(expected, actual, path)
+        when PArrayType
+          describe_PArrayType(expected, actual, path)
         when PCallableType
           describe_PCallableType(expected, actual, path)
         when POptionalType

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

@@ -292,20 +292,6 @@ class PAnyType < TypedModelObject
     end
   end
 
-
-  # Transform size_type to min, max
-  # if size_type == nil the constraint is 1,1
-  # if size_type.from == nil min size = 1
-  # if size_type.to == nil max size == Infinity
-  #
-  # @api private
-  def type_to_range(size_type)
-    return [1,1] if size_type.nil?
-    from = size_type.from
-    to = size_type.to
-    [from.nil? ? 1 : from, to.nil? ? Float::INFINITY : to]
-  end
-
   # Applies a transformation by sending the given _method_ and _method_args_ to each of the types of the given array
   # and collecting the results in a new array. If all transformation calls returned the type instance itself (i.e. no
   # transformation took place), then this method will return `self`. If a transformation did occur, then this method
@@ -606,7 +592,7 @@ class PEnumType < PScalarType
   attr_reader :values
 
   def initialize(values)
-    @values = values.sort.freeze
+    @values = values.uniq.sort.freeze
   end
 
   # Returns Enumerator if no block is given, otherwise, calls the given
@@ -1086,10 +1072,13 @@ class PCollectionType < PAnyType
         (@size_type || DEFAULT_SIZE).assignable?(o.size_type || DEFAULT_SIZE, guard)
       when PTupleType
         # compute the tuple's min/max size, and check if that size matches
-        from, to = type_to_range(o.size_type)
-        from = o.types.size - 1 + from
-        to = o.types.size - 1 + to
-        (@size_type || DEFAULT_SIZE).assignable?(PIntegerType.new(from, to), guard)
+        size_s = size_type || DEFAULT_SIZE
+        size_o = o.size_type
+        if size_o.nil?
+          type_count = o.types.size
+          size_o = PIntegerType.new(type_count, type_count)
+        end
+        size_s.assignable?(size_o)
       when PStructType
         from = to = o.elements.size
         (@size_type || DEFAULT_SIZE).assignable?(PIntegerType.new(from, to), guard)
@@ -2008,26 +1997,14 @@ class PArrayType < PCollectionType
       # tuple can be assigned.
       return true if s_entry.nil?
 
-      return false unless o.types.all? {|o_element_t| s_entry.assignable?(o_element_t, guard) }
-      o_regular = o.types[0..-2]
-      o_ranged = o.types[-1]
-      o_from, o_to = type_to_range(o.size_type)
-      o_required = o_regular.size + o_from
-
-      # array type may be size constrained
+      o_types = o.types
       size_s = size_type || DEFAULT_SIZE
-      min, max = size_s.range
-      # Tuple with fewer min entries can not be assigned
-      return false if o_required < min
-      # Tuple with more optionally available entries can not be assigned
-      return false if o_regular.size + o_to > max
-      # each tuple type must be assignable to the element type
-      o_required.times do |index|
-        o_entry = tuple_entry_at(o, o_to, index)
-        return false unless s_entry.assignable?(o_entry, guard)
+      size_o = o.size_type
+      if size_o.nil?
+        type_count = o_types.size
+        size_o = PIntegerType.new(type_count, type_count)
       end
-      # ... and so must the last, possibly optional (ranged) type
-      s_entry.assignable?(o_ranged)
+      size_s.assignable?(size_o) && o_types.all? { |ot| s_entry.assignable?(ot, guard) }
     elsif o.is_a?(PArrayType)
       super && (s_entry.nil? || s_entry.assignable?(o.element_type, guard))
     else

data/lib/puppet/settings/config_file.rb

@@ -82,7 +82,7 @@ private
   def unique_sections_in(ini, file, allowed_section_names)
     ini.section_lines.collect do |section|
       if !allowed_section_names.empty? && !allowed_section_names.include?(section.name)
-        raise(Puppet::Error, "Illegal section '#{section.name}' in config file #{file} at line #{section.line_number}. The only valid puppet.conf sections are: [#{allowed_section_names.join(", ")}]. Please use the directory environments feature to specify environments. (See https://docs.puppetlabs.com/puppet/latest/reference/environments.html)")
+        raise(Puppet::Error, "Illegal section '#{section.name}' in config file #{file} at line #{section.line_number}. The only valid puppet.conf sections are: [#{allowed_section_names.join(", ")}]. Please use the directory environments feature to specify environments. (See https://docs.puppet.com/puppet/latest/reference/environments.html)")
       end
       section.name
     end.uniq

data/lib/puppet/type.rb

@@ -2132,8 +2132,10 @@ end
 
       # Collect the current prereqs
       list.each { |dep|
+        next if dep.nil?
+
         # Support them passing objects directly, to save some effort.
-        unless dep.is_a? Puppet::Type
+        unless dep.is_a?(Puppet::Type)
           # Skip autorelation that we aren't managing
           unless dep = rel_catalog.resource(type, dep)
             next

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '4.5.0'
+  PUPPETVERSION = '4.5.1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/name.yaml

@@ -1 +1,2 @@
 one::test::param_b: module data param_b is 200
+one::my_var: 'In name.yaml'

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/server1.yaml

@@ -0,0 +1 @@
+one::my_var: 'server1'

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/server2.yaml

@@ -0,0 +1 @@
+one::my_var: 'server2'

data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/hiera.yaml

@@ -1,6 +1,8 @@
 ---
 :version: 4
 :hierarchy:
+  - :name: "%{my_fact}"
+    :backend: yaml
   - :name: "name"
     :backend: yaml
   - :name: "one path"

data/spec/unit/data_providers/hiera_data_provider_spec.rb

@@ -28,14 +28,18 @@ describe "when using a hiera data provider" do
   end
 
   def compile_and_get_notifications(environment, code = nil)
-    compile(environment, code).resources.map(&:ref).select { |r| r.start_with?('Notify[') }.map { |r| r[7..-2] }
+    extract_notifications(compile(environment, code))
   end
 
   def compile(environment, code = nil)
     Puppet[:code] = code if code
     node = Puppet::Node.new("testnode", :facts => facts, :environment => environment)
     compiler = Puppet::Parser::Compiler.new(node)
-    block_given? ? compiler.compile() { |catalog| yield(compiler); catalog } : compiler.compile()
+    block_given? ? compiler.compile { |catalog| yield(compiler); catalog } : compiler.compile
+  end
+
+  def extract_notifications(catalog)
+    catalog.resources.map(&:ref).select { |r| r.start_with?('Notify[') }.map { |r| r[7..-2] }
   end
 
   it 'uses default configuration for environment and module data' do
@@ -147,6 +151,22 @@ describe "when using a hiera data provider" do
     expect(resources).to include('Value from interpolation with alias')
   end
 
+  it 'uses compiler lifecycle for caching' do
+    Puppet[:code] = 'notify{lookup(one::my_var):}'
+    node = Puppet::Node.new('testnode', :facts => facts, :environment => 'hiera_module_config')
+
+    compiler = Puppet::Parser::Compiler.new(node)
+    compiler.topscope['my_fact'] = 'server1'
+    expect(extract_notifications(compiler.compile)).to include('server1')
+
+    compiler = Puppet::Parser::Compiler.new(node)
+    compiler.topscope['my_fact'] = 'server2'
+    expect(extract_notifications(compiler.compile)).to include('server2')
+
+    compiler = Puppet::Parser::Compiler.new(node)
+    expect(extract_notifications(compiler.compile)).to include('In name.yaml')
+  end
+
   it 'traps endless interpolate recursion' do
     expect do
       compile_and_get_notifications('hiera_misc', '$r1 = "%{r2}" $r2 = "%{r1}" notify{lookup(recursive):}')

data/spec/unit/pops/types/type_calculator_spec.rb

@@ -806,6 +806,18 @@ describe 'The type calculator' do
         expect(empty_array_t).to be_assignable_to(array_t(string_t))
         expect(empty_array_t).to be_assignable_to(array_t(integer_t))
       end
+
+      it 'A Tuple is assignable to an array' do
+        expect(tuple_t(String)).to be_assignable_to(array_t(String))
+      end
+
+      it 'A Tuple with <n> elements is assignable to an array with min size <n>' do
+        expect(tuple_t(String,String)).to be_assignable_to(array_t(String, range_t(2, :default)))
+      end
+
+      it 'A Tuple with <n> elements where the last 2 are optional is assignable to an array with size <n> - 2' do
+        expect(constrained_tuple_t(range_t(2, :default), String,String,String,String)).to be_assignable_to(array_t(String, range_t(2, :default)))
+      end
     end
 
     context 'for Hash, such that' do

data/spec/unit/pops/types/type_mismatch_describer_spec.rb

@@ -25,7 +25,7 @@ describe 'the type mismatch describer' do
       }
       f(['a', 23])
     CODE
-    expect { eval_and_collect_notices(code) }.to raise_error(Puppet::Error, /expects an Array\[String\] value, got Tuple\[String, Integer\]/)
+    expect { eval_and_collect_notices(code) }.to raise_error(Puppet::Error, /'f' parameter 'h' index 1 expects a String value, got Integer/)
   end
 
   it 'will not report details for a mismatch between an array and a struct' do
@@ -48,6 +48,26 @@ describe 'the type mismatch describer' do
     expect { eval_and_collect_notices(code) }.to raise_error(Puppet::Error, /expects a Hash value, got Tuple/)
   end
 
+  it 'will report an array size mismatch' do
+    code = <<-CODE
+      function f(Array[String,1,default] $h) {
+        $h[0]
+      }
+      f([])
+    CODE
+    expect { eval_and_collect_notices(code) }.to raise_error(Puppet::Error, /expects size to be at least 1, got 0/)
+  end
+
+  it 'will report a hash size mismatch' do
+    code = <<-CODE
+      function f(Hash[String,String,1,default] $h) {
+         $h['a']
+      }
+      f({})
+    CODE
+    expect { eval_and_collect_notices(code) }.to raise_error(Puppet::Error, /expects size to be at least 1, got 0/)
+  end
+
   it 'will include the aliased type when reporting a mismatch that involves an alias' do
     code = <<-CODE
       type UnprivilegedPort = Integer[1024,65537]

data/spec/unit/pops/types/types_spec.rb

@@ -153,6 +153,22 @@ describe 'Puppet Type System' do
     end
   end
 
+  context 'Enum type' do
+    it 'sorts its entries' do
+      code = <<-CODE
+        Enum[c,b,a].each |$e| { notice $e }
+      CODE
+      expect(eval_and_collect_notices(code)).to eq(['a', 'b', 'c'])
+    end
+
+    it 'makes entries unique' do
+      code = <<-CODE
+        Enum[a,b,c,b,a].each |$e| { notice $e }
+      CODE
+      expect(eval_and_collect_notices(code)).to eq(['a', 'b', 'c'])
+    end
+  end
+
   context 'Iterable type' do
     it 'can be parameterized with element type' do
       code = <<-CODE

data/spec/unit/type_spec.rb

@@ -393,6 +393,24 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
         expect(relationship_graph.edges_between(src,dst).first.event).to eq(:NONE)
       end
 
+      it 'should not fail autorequire contains undef entries' do
+        type = Puppet::Type.newtype(:autorelation_two) do
+          newparam(:name) { isnamevar }
+          autorequire(:autorelation_one) { [nil, 'foo'] }
+        end
+
+        relationship_graph = compile_to_relationship_graph(<<-MANIFEST)
+          autorelation_one { 'foo': }
+          autorelation_two { 'bar': }
+        MANIFEST
+
+        src = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_one[foo]' }.first
+        dst = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_two[bar]' }.first
+
+        expect(relationship_graph.edge?(src,dst)).to be_truthy
+        expect(relationship_graph.edges_between(src,dst).first.event).to eq(:NONE)
+      end
+
       it "should be able to autosubscribe resources" do
         type = Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
@@ -411,6 +429,24 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
         expect(relationship_graph.edges_between(src,dst).first.event).to eq(:ALL_EVENTS)
       end
 
+      it 'should not fail if autosubscribe contains undef entries' do
+        type = Puppet::Type.newtype(:autorelation_two) do
+          newparam(:name) { isnamevar }
+          autosubscribe(:autorelation_one) { [nil, 'foo'] }
+        end
+
+        relationship_graph = compile_to_relationship_graph(<<-MANIFEST)
+          autorelation_one { 'foo': }
+          autorelation_two { 'bar': }
+        MANIFEST
+
+        src = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_one[foo]' }.first
+        dst = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_two[bar]' }.first
+
+        expect(relationship_graph.edge?(src,dst)).to be_truthy
+        expect(relationship_graph.edges_between(src,dst).first.event).to eq(:ALL_EVENTS)
+      end
+
       it "should be able to autobefore resources" do
         type = Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
@@ -429,6 +465,24 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
         expect(relationship_graph.edges_between(src,dst).first.event).to eq(:NONE)
       end
 
+      it "should not fail when autobefore contains undef entries" do
+        type = Puppet::Type.newtype(:autorelation_two) do
+          newparam(:name) { isnamevar }
+          autobefore(:autorelation_one) { [nil, 'foo'] }
+        end
+
+        relationship_graph = compile_to_relationship_graph(<<-MANIFEST)
+          autorelation_one { 'foo': }
+          autorelation_two { 'bar': }
+        MANIFEST
+
+        src = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_two[bar]' }.first
+        dst = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_one[foo]' }.first
+
+        expect(relationship_graph.edge?(src,dst)).to be_truthy
+        expect(relationship_graph.edges_between(src,dst).first.event).to eq(:NONE)
+      end
+
       it "should be able to autonotify resources" do
         type = Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
@@ -446,6 +500,24 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
         expect(relationship_graph.edge?(src,dst)).to be_truthy
         expect(relationship_graph.edges_between(src,dst).first.event).to eq(:ALL_EVENTS)
       end
+
+      it 'should not fail if autonotify contains undef entries' do
+        type = Puppet::Type.newtype(:autorelation_two) do
+          newparam(:name) { isnamevar }
+          autonotify(:autorelation_one) { [nil, 'foo'] }
+        end
+
+        relationship_graph = compile_to_relationship_graph(<<-MANIFEST)
+          autorelation_one { 'foo': }
+          autorelation_two { 'bar': }
+        MANIFEST
+
+        src = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_two[bar]' }.first
+        dst = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_one[foo]' }.first
+
+        expect(relationship_graph.edge?(src,dst)).to be_truthy
+        expect(relationship_graph.edges_between(src,dst).first.event).to eq(:ALL_EVENTS)
+      end
     end
   end
 

data/spec/unit/util/monkey_patches_spec.rb

@@ -9,6 +9,22 @@ describe Symbol do
     $unique_warnings.delete('symbol_comparison') if $unique_warnings
   end
 
+  it 'should have an equal? that is not true for a string with same letters' do
+    symbol = :undef
+    expect(symbol).to_not equal('undef')
+  end
+
+  it "should have an eql? that is not true for a string with same letters" do
+    symbol = :undef
+    expect(symbol).to_not eql('undef')
+  end
+
+  it "should have an == that is not true for a string with same letters" do
+    pending "JRuby is incompatible with MRI - Cannot test this on JRuby" if RUBY_PLATFORM == 'java'
+    symbol = :undef
+    expect(symbol == 'undef').to_not be(true)
+  end
+
   it "should return self from #intern" do
     symbol = :foo
     expect(symbol).to equal symbol.intern

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1629,6 +1629,8 @@ files:
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/name.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/single.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/second.json
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/server2.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/server1.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/first.json
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/metadata.json
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/hiera.yaml
@@ -2859,6 +2861,8 @@ test_files:
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/name.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/single.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/second.json
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/server2.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/server1.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/first.json
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/metadata.json
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/hiera.yaml