REST: hide Request object

This change to the REST branch restores some sanity by explicitly
allowing a destination URL for indirector save() calls,
removing a hack that I was using to accomplish this.

2 files changed, 2 insertions, 4 deletions

diff --git a/lib/puppet/application/resource.rb b/lib/puppet/application/resource.rb
index 0046fc1d8..ae4349850 100644
--- a/lib/puppet/application/resource.rb
+++ b/lib/puppet/application/resource.rb
@@ -83,8 +83,7 @@ Puppet::Application.new(:resource) do
             if params.empty?
                 [ Puppet::Resource.find( key ) ]
             else
-                request = Puppet::Indirector::Request.new(:resource, :save, key) # Yuck.
-                [ Puppet::Resource.new( type, name, params ).save( request ) ]
+                [ Puppet::Resource.new( type, name, params ).save( key ) ]
             end
         else
             Puppet::Resource.search( key, {} )
diff --git a/lib/puppet/application/run.rb b/lib/puppet/application/run.rb
index 26ca362ff..46d1b191f 100644
--- a/lib/puppet/application/run.rb
+++ b/lib/puppet/application/run.rb
@@ -120,13 +120,12 @@ Puppet::Application.new(:run) do
 
         print "Triggering %s\n" % host
         begin
-            request = Puppet::Indirector::Request.new(:run, :save, url) # Yuck.
             run_options = {
                 :tags => @tags,
                 :background => ! options[:foreground],
                 :ignoreschedules => options[:ignoreschedules]
             }
-            run = Puppet::Run.new( run_options ).save( request )
+            run = Puppet::Run.new( run_options ).save( url )
             result = run.status
         rescue => detail
             puts detail.backtrace if Puppet[:trace]