X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fdefined_with_params.rb;h=cc2b90a43572eadc098d57740e0897654d9ce009;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=d7df306c7932e6f310669c58c4c21a1a0a291b85;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
index d7df306c7..cc2b90a43 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
@@ -3,30 +3,58 @@ require 'puppet/parser/functions'
 
 Puppet::Parser::Functions.newfunction(:defined_with_params,
                                       :type => :rvalue,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource reference and an optional hash of attributes.
+                                      :doc => <<-DOC
+    @summary
+      Takes a resource reference and an optional hash of attributes.
 
-Returns true if a resource with the specified attributes has already been added
-to the catalog, and false otherwise.
+    Returns `true` if a resource with the specified attributes has already been added
+    to the catalog, and `false` otherwise.
 
-    user { 'dan':
-      ensure => present,
-    }
+      ```
+      user { 'dan':
+        ensure => present,
+      }
 
-    if ! defined_with_params(User[dan], {'ensure' => 'present' }) {
-      user { 'dan': ensure => present, }
-    }
-ENDOFDOC
-) do |vals|
+      if ! defined_with_params(User[dan], {'ensure' => 'present' }) {
+        user { 'dan': ensure => present, }
+      }
+      ```
+
+    @return [Boolean]
+      returns `true` or `false`
+DOC
+                                     ) do |vals|
   reference, params = vals
   raise(ArgumentError, 'Must specify a reference') unless reference
-  if (! params) || params == ''
+  if !params || params == ''
     params = {}
   end
   ret = false
-  if resource = findresource(reference.to_s)
-    matches = params.collect do |key, value|
-      resource[key] == value
+
+  if Puppet::Util::Package.versioncmp(Puppet.version, '4.6.0') >= 0
+    # Workaround for PE-20308
+    if reference.is_a?(String)
+      type_name, title = Puppet::Resource.type_and_title(reference, nil)
+      type = Puppet::Pops::Evaluator::Runtime3ResourceSupport.find_resource_type_or_class(find_global_scope, type_name.downcase)
+    elsif reference.is_a?(Puppet::Resource)
+      type = reference.type
+      title = reference.title
+    else
+      raise(ArgumentError, "Reference is not understood: '#{reference.class}'")
+    end
+    # end workaround
+  else
+    type = reference.to_s
+    title = nil
+  end
+
+  resource = findresource(type, title)
+  if resource
+    matches = params.map do |key, value|
+      # eql? avoids bugs caused by monkeypatching in puppet
+      resource_is_undef = resource[key].eql?(:undef) || resource[key].nil?
+      value_is_undef = value.eql?(:undef) || value.nil?
+      (resource_is_undef && value_is_undef) || (resource[key] == value)
     end
     ret = params.empty? || !matches.include?(false)
   end