Merge pull request #843 from kelseyhightower/ticket/3.0rc/14900_data_…

…bindings_does_not_support_hiera_puppet_backend

Ticket/3.0rc/14900 data bindings does not support hiera puppet backend

lib/puppet/indirector/hiera.rb

@@ -9,8 +9,7 @@ def initialize(*args)
   end
 
   def find(request)
-    facts = Puppet::Node::Facts.indirection.find(request.options[:host]).values
-    hiera.lookup(request.key, nil, facts, nil, nil)
+    hiera.lookup(request.key, nil, request.options[:scope], nil, nil)
   end
 
   private

lib/puppet/resource.rb

@@ -317,7 +317,7 @@ def set_default_parameters(scope)
       if resource_type.type == :hostclass
         namespaced_param = "#{resource_type.name}::#{param}"
         external_value = Puppet::DataBinding.indirection.find(
-          namespaced_param, :host => scope.host)
+          namespaced_param, :scope => scope)
       end
 
       if external_value.nil?

spec/unit/indirector/hiera_spec.rb

@@ -119,10 +119,6 @@ module Testing; end
   end
 
   describe "the behavior of the find method", :if => Puppet.features.hiera? do
-    before do
-      Puppet::Node::Facts.indirection.expects(:find).with('foo').
-        returns(facter_obj)
-    end
 
     let(:data_binder) { @hiera_class.new }
 

spec/unit/resource_spec.rb

@@ -322,26 +322,26 @@
 
         it "should query the data_binding terminus using a namespaced key" do
           Puppet::DataBinding.indirection.expects(:find).with(
-            'apache::port', :host => 'foo')
+            'apache::port', :scope => @scope)
           resource.set_default_parameters(@scope)
         end
 
-        it "should query the data_binding terminus using the host attribute from the scope" do
+        it "should query the data_binding terminus using the scope object" do
           Puppet::DataBinding.indirection.expects(:find).with(
-            'apache::port', :host => 'foo')
+            'apache::port', :scope => @scope)
           resource.set_default_parameters(@scope)
         end
 
         it "should use the value from the data_binding terminus" do
           Puppet::DataBinding.indirection.expects(:find).with(
-            'apache::port', :host => 'foo').returns('443')
+            'apache::port', :scope => @scope).returns('443')
           resource.set_default_parameters(@scope).should == [:port]
           resource[:port].should == '443'
         end
 
         it "should use the default value if the data_binding terminus returns nil" do
           Puppet::DataBinding.indirection.expects(:find).with(
-            'apache::port', :host => 'foo').returns(nil)
+            'apache::port', :scope => @scope).returns(nil)
           resource.set_default_parameters(@scope).should == [:port]
           resource[:port].should == '80'
         end