diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/indirector/request.rb | 19 | ||||
| -rw-r--r-- | lib/puppet/indirector/rest.rb | 16 |
2 files changed, 28 insertions, 7 deletions
diff --git a/lib/puppet/indirector/request.rb b/lib/puppet/indirector/request.rb index 7fe029597..450b43bd2 100644 --- a/lib/puppet/indirector/request.rb +++ b/lib/puppet/indirector/request.rb @@ -5,20 +5,34 @@ require 'puppet/indirector' # Indirection call, and as a a result also handles REST calls. It's somewhat # analogous to an HTTP Request object, except tuned for our Indirector. class Puppet::Indirector::Request - attr_accessor :indirection_name, :key, :method, :options, :instance, :node, :ip, :authenticated, :ignore_cache, :ignore_terminus + attr_accessor :key, :method, :options, :instance, :node, :ip, :authenticated, :ignore_cache, :ignore_terminus attr_accessor :server, :port, :uri, :protocol + attr_reader :environment, :indirection_name + # Is this an authenticated request? def authenticated? # Double negative, so we just get true or false ! ! authenticated end + def environment=(env) + @environment = if env.is_a?(Puppet::Node::Environment) + env + else + Puppet::Node::Environment.new(env) + end + end + def escaped_key URI.escape(key) end + def indirection_name=(name) + @indirection_name = name.to_sym + end + # LAK:NOTE This is a messy interface to the cache, and it's only # used by the Configurer class. I decided it was better to implement # it now and refactor later, when we have a better design, than @@ -36,7 +50,8 @@ class Puppet::Indirector::Request options ||= {} raise ArgumentError, "Request options must be a hash, not %s" % options.class unless options.is_a?(Hash) - @indirection_name, @method = indirection_name, method + self.indirection_name = indirection_name + self.method = method @options = options.inject({}) do |result, ary| param, value = ary diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb index e5efb3aa3..6429b22b7 100644 --- a/lib/puppet/indirector/rest.rb +++ b/lib/puppet/indirector/rest.rb @@ -62,14 +62,14 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus end def find(request) - deserialize network(request).get("/#{indirection.name}/#{request.escaped_key}#{request.query_string}", headers) + deserialize network(request).get("/#{environment}/#{indirection.name}/#{request.escaped_key}#{request.query_string}", headers) end def search(request) if request.key - path = "/#{indirection.name}s/#{request.escaped_key}#{request.query_string}" + path = "/#{environment}/#{indirection.name}s/#{request.escaped_key}#{request.query_string}" else - path = "/#{indirection.name}s#{request.query_string}" + path = "/#{environment}/#{indirection.name}s#{request.query_string}" end unless result = deserialize(network(request).get(path, headers), true) return [] @@ -79,11 +79,17 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus def destroy(request) raise ArgumentError, "DELETE does not accept options" unless request.options.empty? - deserialize network(request).delete("/#{indirection.name}/#{request.escaped_key}", headers) + deserialize network(request).delete("/#{environment}/#{indirection.name}/#{request.escaped_key}", headers) end def save(request) raise ArgumentError, "PUT does not accept options" unless request.options.empty? - deserialize network(request).put("/#{indirection.name}/", request.instance.render, headers) + deserialize network(request).put("/#{environment}/#{indirection.name}/", request.instance.render, headers) + end + + private + + def environment + Puppet::Node::Environment.new end end |