Updating search to support attributes and not running a block.

Author: adamhjk

chef/lib/chef/recipe.rb

@@ -89,13 +89,17 @@ def resources(*args)
       @collection.resources(*args)
     end
 
-    def search(type, query, &block)
+    def search(type, query, attributes=[], &block)
       Chef::Log.debug("Searching #{type} index with #{query}")
       r = Chef::REST.new(Chef::Config[:search_url])
-      results = r.get_rest("search/#{type}?q=#{query}")
+      results = r.get_rest("search/#{type}?q=#{query}&a=#{attributes.join(',')}")
       Chef::Log.debug("Searching #{type} index with #{query} returned #{results.length} entries")
-      results.each do |sr|
-        block.call(sr)
+      if block
+        results.each do |sr|
+          block.call(sr)
+        end
+      else
+        results
       end
     end
 

example-repository/cookbooks/CHEF-90/recipes/default.rb

@@ -0,0 +1,27 @@
+#
+# Cookbook Name:: CHEF-90
+# Recipe:: default
+#
+# Copyright 2009, Example Com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+results = search(:node, '*', [ 'ipaddress', 'hostname' ])
+Chef::Log.info(results.inspect)
+
+search(:node, '*', [ 'ipaddress', 'hostname' ]) do |n|
+  Chef::Log.info("#{n['ipaddress']} #{n['hostname']}")
+end
+
+Chef::Log.info(search(:node, '*').inspect)