Merge branch '0.24.x'

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/puppet/indirector/request.rb b/lib/puppet/indirector/request.rb
new file mode 100644
index 000000000..68b7ee160
--- /dev/null
+++ b/lib/puppet/indirector/request.rb
@@ -0,0 +1,25 @@
+require 'puppet/indirector'
+
+# Provide any attributes or functionality needed for indirected
+# instances.
+class Puppet::Indirector::Request
+    attr_accessor :indirection_name, :key, :method, :options, :instance
+
+    def initialize(indirection_name, method, key, options = {})
+        @indirection_name, @method, @options = indirection_name, method, (options || {})
+
+        if key.is_a?(String) or key.is_a?(Symbol)
+            @key = key
+        else
+            @instance = key
+            @key = @instance.name
+        end
+
+        raise ArgumentError, "Request options must be a hash, not %s" % @options.class unless @options.is_a?(Hash)
+    end
+
+    # Look up the indirection based on the name provided.
+    def indirection
+        Puppet::Indirector::Indirection.instance(@indirection_name)
+    end
+end