Merge branch 'CHEF-2244'

3 files changed, 10 insertions, 1 deletions

diff --git a/chef/lib/chef/api_client.rb b/chef/lib/chef/api_client.rb
index 148090d7be..f95978afba 100644
--- a/chef/lib/chef/api_client.rb
+++ b/chef/lib/chef/api_client.rb
@@ -60,6 +60,12 @@ class Chef
       }
     }
 
+    INDEX_OBJECT_TYPE = 'client'.freeze
+
+    def self.index_object_type
+      INDEX_OBJECT_TYPE
+    end
+
     attr_accessor :couchdb_rev, :couchdb_id, :couchdb
 
     # Create a new Chef::ApiClient object.
diff --git a/chef/lib/chef/knife/search.rb b/chef/lib/chef/knife/search.rb
index 79a82eb0b6..855ca20e27 100644
--- a/chef/lib/chef/knife/search.rb
+++ b/chef/lib/chef/knife/search.rb
@@ -24,6 +24,9 @@ class Chef
     class Search < Knife
 
       deps do
+        require 'chef/node'
+        require 'chef/environment'
+        require 'chef/api_client'
         require 'chef/search/query'
       end
 
diff --git a/chef/lib/chef/solr_query.rb b/chef/lib/chef/solr_query.rb
index 8c14e6d93f..fd91f26e60 100644
--- a/chef/lib/chef/solr_query.rb
+++ b/chef/lib/chef/solr_query.rb
@@ -152,7 +152,7 @@ class Chef
       delete_database(db)
 
       results = {}
-      [Chef::ApiClient, Chef::Node, Chef::Role].each do |klass|
+      [Chef::ApiClient, Chef::Node, Chef::Role, Chef::Environment].each do |klass|
         results[klass.name] = reindex_all(klass) ? "success" : "failed"
       end
       databags = Chef::DataBag.cdb_list(true)