Adding metadata delegation from param to resource

This is for file, line, version, and tags, with the
parameter name added to the tags.

This is mostly so logs generated by the parameters
work better.

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 19 insertions, 13 deletions

diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb
index c594ed5f4..f4086671d 100644
--- a/lib/puppet/parameter.rb
+++ b/lib/puppet/parameter.rb
@@ -359,6 +359,12 @@ class Puppet::Parameter
     # LAK 2007-05-09: Keep the @parent around for backward compatibility.
     attr_accessor :parent
 
+    [:line, :file, :version].each do |param|
+        define_method(param) do
+            resource.send(param)
+        end
+    end
+
     def devfail(msg)
         self.fail(Puppet::DevError, msg)
     end
@@ -513,6 +519,19 @@ class Puppet::Parameter
         @resource.provider
     end
 
+    # The properties need to return tags so that logs correctly collect them.
+    def tags
+        unless defined? @tags
+            @tags = []
+            # This might not be true in testing
+            if @resource.respond_to? :tags
+                @tags = @resource.tags
+            end
+            @tags << self.name.to_s
+        end
+        @tags
+    end
+
     def to_s
         s = "Parameter(%s)" % self.name
     end
diff --git a/lib/puppet/property.rb b/lib/puppet/property.rb
index 487028ed2..1ed323f16 100644
--- a/lib/puppet/property.rb
+++ b/lib/puppet/property.rb
@@ -370,19 +370,6 @@ class Puppet::Property < Puppet::Parameter
         end
     end
 
-    # The properties need to return tags so that logs correctly collect them.
-    def tags
-        unless defined? @tags
-            @tags = []
-            # This might not be true in testing
-            if @resource.respond_to? :tags
-                @tags = @resource.tags
-            end
-            @tags << self.name.to_s
-        end
-        @tags
-    end
-
     def to_s
         return "%s(%s)" % [@resource.name,self.name]
     end