Upgrade to upstream v7.3.3

lib/chewy.rb

@@ -98,6 +98,9 @@ def derive_name(index_name)
     def client
       Chewy.current[:chewy_client] ||= begin
         client_configuration = configuration.deep_dup
+        if hosts
+          client_configuration[:hosts] = client_configuration[hosts]
+        end
         client_configuration.delete(:prefix) # used by Chewy, not relevant to Elasticsearch::Client
         block = client_configuration[:transport_options].try(:delete, :proc)
         ::Elasticsearch::Client.new(client_configuration, &block)
@@ -119,6 +122,7 @@ def wait_for_status
     # Be careful, if current prefix is blank, this will destroy all the indexes.
     #
     def massacre
+      # TODO(Max): Add hosts to this client call
       Chewy.client.indices.delete(index: [Chewy.configuration[:prefix], '*'].reject(&:blank?).join('_'))
       Chewy.wait_for_status
     end

lib/chewy/index.rb

@@ -48,6 +48,8 @@ class Index
     self._default_import_options = {}
 
     class << self
+      attr_reader :hosts_name
+
       # @overload index_name(suggest)
       #   If suggested name is passed, it is set up as the new base name for
       #   the index. Used for the index base name redefinition.
@@ -92,6 +94,13 @@ def index_name(suggest = nil, prefix: nil, suffix: nil)
         end
       end
 
+      # Sets the hosts name of the index. If hosts_name is nil, use the default
+      # hosts in chewy.yml. Otherwise use the hosts with the specified name for
+      # indexing/queries.
+      def set_hosts_name(hosts_name)
+        @hosts_name = hosts_name
+      end
+
       # Base name for the index. Uses the default value inferred from the
       # class name unless redefined.
       #

lib/chewy/index/actions.rb

@@ -12,7 +12,7 @@ module ClassMethods
         #   UsersIndex.exists? #=> true
         #
         def exists?
-          client.indices.exists(index: index_name)
+          client(@hosts_name).indices.exists(index: index_name)
         end
 
         # Creates index and applies mappings and settings.
@@ -59,7 +59,7 @@ def create!(suffix = nil, **options)
 
           body = specification_hash
           body[:aliases] = {general_name => {}} if options[:alias] && suffixed_name != general_name
-          result = client.indices.create(index: suffixed_name, body: body)
+          result = client(@hosts_name).indices.create(index: suffixed_name, body: body)
 
           Chewy.wait_for_status if result
           result
@@ -164,13 +164,13 @@ def reset!(suffix = nil, apply_journal: true, journal: false, **import_options)
             original_index_settings suffixed_name
 
             delete if indexes.blank?
-            client.indices.update_aliases body: {actions: [
+            client(@hosts_name).indices.update_aliases body: {actions: [
               *indexes.map do |index|
                 {remove: {index: index, alias: general_name}}
               end,
               {add: {index: suffixed_name, alias: general_name}}
             ]}
-            client.indices.delete index: indexes if indexes.present?
+            client(@hosts_name).indices.delete index: indexes if indexes.present?
 
             self.journal.apply(start_time, **import_options) if apply_journal
             result
@@ -255,7 +255,7 @@ def original_index_settings(index_name)
         end
 
         def update_settings(index_name, **options)
-          client.indices.put_settings index: index_name, body: {index: options[:settings]}
+          client(@hosts_name).indices.put_settings index: index_name, body: {index: options[:settings]}
         end
 
         def index_settings(setting_name)