elasticsearch-extensions 0.0.31 → 0.0.33

data/lib/elasticsearch/extensions/reindex.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 # encoding: utf-8
 
 module Elasticsearch
@@ -23,10 +40,10 @@ module Elasticsearch
       end; extend self
 
       module API
-        # Copy documents from one index into another and refresh the target index
+        # Copy documents from one index into another and refresh the destination index
         #
         # @example
-        #     client.reindex source: { index: 'test1' }, target: { index: 'test2' }, refresh: true
+        #     client.reindex source: { index: 'test1' }, dest: { index: 'test2' }, refresh: true
         #
         # The method allows all the options as {Reindex::Reindex.new}.
         #
@@ -50,40 +67,40 @@ module Elasticsearch
       #   client  = Elasticsearch::Client.new
       #   reindex = Elasticsearch::Extensions::Reindex.new \
       #               source: { index: 'test1', client: client },
-      #               target: { index: 'test2' }
+      #               dest: { index: 'test2' }
       #
       #   reindex.perform
       #
       # @example Copy documents to a different cluster
       #
       #     source_client  = Elasticsearch::Client.new url: 'http://localhost:9200'
-      #     target_client  = Elasticsearch::Client.new url: 'http://localhost:9250'
+      #     destination_client  = Elasticsearch::Client.new url: 'http://localhost:9250'
       #
       #     reindex = Elasticsearch::Extensions::Reindex.new \
       #                 source: { index: 'test', client: source_client },
-      #                 target: { index: 'test', client: target_client }
+      #                 dest: { index: 'test', client: destination_client }
       #     reindex.perform
       #
       # @example Transform the documents during re-indexing
       #
       #     reindex = Elasticsearch::Extensions::Reindex.new \
       #                 source: { index: 'test1', client: client },
-      #                 target: { index: 'test2' },
+      #                 dest: { index: 'test2' },
       #                 transform: lambda { |doc| doc['_source']['category'].upcase! }
       #
       #
       # The reindexing process works by "scrolling" an index and sending
-      # batches via the "Bulk" API to the target index/cluster
+      # batches via the "Bulk" API to the destination index/cluster
       #
       # @option arguments [String] :source The source index/cluster definition (*Required*)
-      # @option arguments [String] :target The target index/cluster definition (*Required*)
+      # @option arguments [String] :dest The destination index/cluster definition (*Required*)
       # @option arguments [Proc] :transform A block which will be executed for each document
       # @option arguments [Integer] :batch_size The size of the batch for scroll operation (Default: 1000)
       # @option arguments [String] :scroll The timeout for the scroll operation (Default: 5min)
-      # @option arguments [Boolean] :refresh Whether to refresh the target index after
+      # @option arguments [Boolean] :refresh Whether to refresh the destination index after
       #                                      the operation is completed (Default: false)
       #
-      # Be aware, that if you want to change the target index settings and/or mappings,
+      # Be aware, that if you want to change the destination index settings and/or mappings,
       # you have to do so in advance by using the "Indices Create" API.
       #
       # Note, that there is a native "Reindex" API in Elasticsearch 2.3.x and higer versions,
@@ -98,7 +115,7 @@ module Elasticsearch
           [
             [:source, :index],
             [:source, :client],
-            [:target, :index]
+            [:dest, :index]
           ].each do |required_option|
             value = required_option.reduce(arguments) { |sum, o| sum = sum[o] ? sum[o] : {}  }
 
@@ -113,7 +130,7 @@ module Elasticsearch
             refresh: false
           }.merge(arguments)
 
-          arguments[:target][:client] ||= arguments[:source][:client]
+          arguments[:dest][:client] ||= arguments[:source][:client]
         end
 
         # Performs the operation
@@ -144,14 +161,14 @@ module Elasticsearch
             output[:errors] += bulk_response['items'].select { |k, v| k.values.first['error'] }.size
           end
 
-          arguments[:target][:client].indices.refresh index: arguments[:target][:index] if arguments[:refresh]
+          arguments[:dest][:client].indices.refresh index: arguments[:dest][:index] if arguments[:refresh]
 
           output
         end
 
         def __store_batch(documents)
           body = documents.map do |doc|
-            doc['_index'] = arguments[:target][:index]
+            doc['_index'] = arguments[:dest][:index]
 
             arguments[:transform].call(doc) if arguments[:transform]
 
@@ -162,7 +179,7 @@ module Elasticsearch
             { index: doc }
           end
 
-          arguments[:target][:client].bulk body: body
+          arguments[:dest][:client].bulk body: body
         end
       end
     end

data/lib/elasticsearch/extensions/test/cluster/tasks.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 require 'elasticsearch/extensions/test/cluster'
 
 namespace :elasticsearch do

data/lib/elasticsearch/extensions/test/cluster.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 require 'timeout'
 require 'net/http'
 require 'fileutils'
@@ -21,7 +38,6 @@ end
 module Elasticsearch
   module Extensions
     module Test
-
       # A convenience Ruby class for starting and stopping an Elasticsearch cluster,
       # eg. for integration tests
       #
@@ -43,12 +59,11 @@ module Elasticsearch
       # @see Cluster#initialize
       #
       module Cluster
-
         # Starts a cluster
         #
         # @see Cluster#start
         #
-        def start(arguments={})
+        def start(arguments = {})
           Cluster.new(arguments).start
         end
 
@@ -56,7 +71,7 @@ module Elasticsearch
         #
         # @see Cluster#stop
         #
-        def stop(arguments={})
+        def stop(arguments = {})
           Cluster.new(arguments).stop
         end
 
@@ -64,7 +79,7 @@ module Elasticsearch
         #
         # @see Cluster#running?
         #
-        def running?(arguments={})
+        def running?(arguments = {})
           Cluster.new(arguments).running?
         end
 
@@ -72,7 +87,7 @@ module Elasticsearch
         #
         # @see Cluster#wait_for_green
         #
-        def wait_for_green(arguments={})
+        def wait_for_green(arguments = {})
           Cluster.new(arguments).wait_for_green
         end
 
@@ -190,6 +205,7 @@ module Elasticsearch
                 -E path.repo=/tmp \
                 -E repositories.url.allowed_urls=http://snapshot.test* \
                 -E discovery.zen.minimum_master_nodes=#{arguments[:number_of_nodes]-1} \
+                #{'-E xpack.security.enabled=false' unless arguments[:dist] == 'oss'} \
                 -E node.max_local_storage_nodes=#{arguments[:number_of_nodes]} \
                 -E logger.level=#{ENV['DEBUG'] ? 'DEBUG' : 'INFO'} \
                 #{arguments[:es_params]}
@@ -197,6 +213,7 @@ module Elasticsearch
             }
           }
           COMMANDS['7.0'] = COMMANDS['6.0'].clone
+          COMMANDS['8.0'] = COMMANDS['7.0'].clone
           COMMANDS.freeze
 
           # Create a new instance of the Cluster class
@@ -238,7 +255,11 @@ module Elasticsearch
             @arguments[:network_host]      ||= ENV.fetch('TEST_CLUSTER_NETWORK_HOST', __default_network_host)
             @arguments[:quiet]             ||= ! ENV.fetch('QUIET', '').empty?
 
-            @clear_cluster = !!@arguments[:clear_cluster] || (ENV.fetch('TEST_CLUSTER_CLEAR', 'true') != 'false')
+            @clear_cluster = if @arguments[:clear_cluster].nil?
+                               (ENV.fetch('TEST_CLUSTER_CLEAR', 'true') != 'false')
+                             else
+		                           !!@arguments[:clear_cluster]
+                             end
 
             # Make sure `cluster_name` is not dangerous
             raise ArgumentError, "The `cluster_name` argument cannot be empty string or a slash" \
@@ -408,7 +429,7 @@ module Elasticsearch
                 '0.0.0.0'
               when /^2/
                 '_local_'
-              when /^5|^6|^7/
+              when /^5|^6|^7|^8/
                 '_local_'
               else
                 raise RuntimeError, "Cannot determine default network host from version [#{version}]"
@@ -455,8 +476,8 @@ module Elasticsearch
               arguments[:version]
             elsif File.exist?(path_to_lib) && !(jar = Dir.entries(path_to_lib).select { |f| f =~ /^elasticsearch\-\d/ }.first).nil?
               __log "Determining version from [#{jar}]" if ENV['DEBUG']
-              if m = jar.match(/elasticsearch\-(\S+-)?(?<version>\d+\.\d+\.\d+).*/)
-                m[:version]
+              if m = jar.match(/elasticsearch\-(\d+\.\d+\.\d+).*/)
+                m[1]
               else
                 raise RuntimeError, "Cannot determine Elasticsearch version from jar [#{jar}]"
               end
@@ -508,7 +529,9 @@ module Elasticsearch
                 raise RuntimeError, "Cannot determine Elasticsearch version from [#{arguments[:command]} --version] or [#{arguments[:command]} -v]"
               end
 
-              if m = output.match(/Version: (\d\.\d.\d).*,/)
+              @dist = output.match(/Build: ([a-z]+)\//)&.[](1)
+
+              if(m = output.match(/Version: (\d+\.\d+.\d+).*,/))
                 m[1]
               else
                 raise RuntimeError, "Cannot determine Elasticsearch version from elasticsearch --version output [#{output}]"
@@ -528,6 +551,8 @@ module Elasticsearch
                 '6.0'
               when /^7\..*/
                 '7.0'
+              when /^8\..*/
+                '8.0'
               else
                 raise RuntimeError, "Cannot determine major version from [#{version}]"
             end
@@ -540,11 +565,10 @@ module Elasticsearch
           # @return String
           #
           def __command(version, arguments, node_number)
-            if command = COMMANDS[version]
-              command.call(arguments, node_number)
-            else
-              raise ArgumentError, "Cannot find command for version [#{version}]"
-            end
+            raise ArgumentError, "Cannot find command for version [#{version}]" unless (command = COMMANDS[version])
+
+            arguments.merge!({ dist: @dist })
+            command.call(arguments, node_number)
           end
 
           # Blocks the process and waits for the cluster to be in a "green" state
@@ -646,7 +670,6 @@ module Elasticsearch
             FileUtils.rm_rf arguments[:path_data]
           end
 
-
           # Check whether process for PIDs are running
           #
           # @api private

data/lib/elasticsearch/extensions/test/profiling.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 require 'ruby-prof'
 require 'benchmark'
 require 'ansi'

data/lib/elasticsearch/extensions/test/startup_shutdown.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 module Elasticsearch
   module Extensions
     module Test

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.31"
+    VERSION = '0.0.33'.freeze
   end
 end

data/lib/elasticsearch/extensions.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 # encoding: utf-8
 
 require 'elasticsearch'

data/lib/elasticsearch-extensions.rb

@@ -1 +1,6 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+#
+
 require 'elasticsearch/extensions'

data/test/ansi/unit/ansi_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 require 'test_helper'
 require 'elasticsearch/extensions/ansi'
 
@@ -7,10 +24,10 @@ class Elasticsearch::Extensions::AnsiTest < Elasticsearch::Test::UnitTestCase
       @client = Elasticsearch::Client.new
       @client.stubs(:perform_request).returns \
         Elasticsearch::Transport::Transport::Response.new(200, { "ok" => true, "status" => 200, "name" => "Hit-Maker",
-            "version" => { "number"     => "0.90.7",
-                           "build_hash" => "abc123",
-                           "build_timestamp"=>"2013-11-13T12:06:54Z", "build_snapshot"=>false, "lucene_version"=>"4.5.1" },
-            "tagline"=>"You Know, for Search" })
+                                                                 "version" => { "number"     => "0.90.7",
+                                                                                "build_hash" => "abc123",
+                                                                                "build_timestamp"=>"2013-11-13T12:06:54Z", "build_snapshot"=>false, "lucene_version"=>"4.5.1" },
+                                                                 "tagline"=>"You Know, for Search" })
     end
 
     should "wrap the response" do
@@ -30,7 +47,7 @@ class Elasticsearch::Extensions::AnsiTest < Elasticsearch::Test::UnitTestCase
     should "call the 'awesome_inspect' method when available and no handler found" do
       @client.stubs(:perform_request).returns \
         Elasticsearch::Transport::Transport::Response.new(200, {"index-1"=>{"aliases"=>{}}})
-      response = @client.indices.get_aliases
+      response = @client.cat.aliases
 
       response.instance_eval do
         def awesome_inspect; "---PRETTY---"; end
@@ -41,7 +58,7 @@ class Elasticsearch::Extensions::AnsiTest < Elasticsearch::Test::UnitTestCase
     should "call `to_s` method when no pretty printer or handler found" do
       @client.stubs(:perform_request).returns \
         Elasticsearch::Transport::Transport::Response.new(200, {"index-1"=>{"aliases"=>{}}})
-      response = @client.indices.get_aliases
+      response = @client.cat.aliases
 
       assert_equal '{"index-1"=>{"aliases"=>{}}}', response.to_ansi
     end

data/test/backup/unit/backup_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 require 'test_helper'
 require 'logger'
 
@@ -106,5 +123,9 @@ class Elasticsearch::Extensions::BackupTest < Elasticsearch::Test::UnitTestCase
 
       @subject.__perform_single
     end
+
+    should "sanitize filename" do
+      assert_equal "foo-bar-baz", @subject.__sanitize_filename("foo/bar\nbaz")
+    end
   end
 end

data/test/reindex/integration/reindex_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 require 'test_helper'
 require 'elasticsearch/extensions/reindex'
 
@@ -17,7 +34,7 @@ class Elasticsearch::Extensions::ReindexIntegrationTest < Elasticsearch::Test::I
         ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
       end
 
-      @client = Elasticsearch::Client.new host: "localhost:#{@port}", logger: @logger
+      @client = Elasticsearch::Client.new host: "#{TEST_HOST}:#{TEST_PORT}", logger: @logger
       @client.indices.delete index: '_all'
 
       @client.index index: 'test1', type: 'd', id: 1, body: { title: 'TEST 1', category: 'one' }
@@ -37,53 +54,53 @@ class Elasticsearch::Extensions::ReindexIntegrationTest < Elasticsearch::Test::I
     should "copy documents from one index to another" do
       reindex = Elasticsearch::Extensions::Reindex.new \
                   source: { index: 'test1', client: @client },
-                  target: { index: 'test2' },
+                  dest: { index: 'test2' },
                   batch_size: 2,
                   refresh: true
 
       result = reindex.perform
 
       assert_equal 0, result[:errors]
-      assert_equal 3, @client.search(index: 'test2')['hits']['total']
+      assert_equal 3, @client.search(index: 'test2')['hits']['total']['value']
     end
 
     should "transform documents with a lambda" do
       reindex = Elasticsearch::Extensions::Reindex.new \
                   source: { index: 'test1', client: @client },
-                  target: { index: 'test2' },
+                  dest: { index: 'test2' },
                   transform: lambda { |d| d['_source']['category'].upcase! },
                   refresh: true
 
       result = reindex.perform
 
       assert_equal 0, result[:errors]
-      assert_equal 3, @client.search(index: 'test2')['hits']['total']
+      assert_equal 3, @client.search(index: 'test2')['hits']['total']['value']
       assert_equal 'ONE', @client.get(index: 'test2', type: 'd', id: 1)['_source']['category']
     end
 
     should "return the number of errors" do
-      @client.indices.create index: 'test3', body: { mappings: { d: { properties: { category: { type: 'integer' } }}}}
+      @client.indices.create index: 'test3', body: { mappings: { properties: { category: { type: 'integer' } }}}
       @client.cluster.health wait_for_status: 'yellow'
 
       reindex = Elasticsearch::Extensions::Reindex.new \
                   source: { index: 'test1', client: @client },
-                  target: { index: 'test3' }
+                  dest: { index: 'test3' }
 
       result = reindex.perform
 
       @client.indices.refresh index: 'test3'
 
       assert_equal 3, result[:errors]
-      assert_equal 0, @client.search(index: 'test3')['hits']['total']
+      assert_equal 0, @client.search(index: 'test3')['hits']['total']['value']
     end
 
     should "reindex via the API integration" do
       @client.indices.create index: 'test4'
 
-      @client.reindex source: { index: 'test1' }, target: { index: 'test4' }
+      @client.reindex source: { index: 'test1' }, dest: { index: 'test4' }
       @client.indices.refresh index: 'test4'
 
-      assert_equal 3, @client.search(index: 'test4')['hits']['total']
+      assert_equal 3, @client.search(index: 'test4')['hits']['total']['value']
     end
   end
 

data/test/reindex/unit/reindex_test.rb

@@ -1,9 +1,26 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 require 'test_helper'
 require 'elasticsearch/extensions/reindex'
 
 class Elasticsearch::Extensions::ReindexTest < Elasticsearch::Test::UnitTestCase
   context "The Reindex extension module" do
-    DEFAULT_OPTIONS = { source: { index: 'foo', client: Object.new }, target: { index: 'bar' } }
+    DEFAULT_OPTIONS = { source: { index: 'foo', client: Object.new }, dest: { index: 'bar' } }
 
     should "require options" do
       assert_raise ArgumentError do
@@ -50,7 +67,7 @@ class Elasticsearch::Extensions::ReindexTest < Elasticsearch::Test::UnitTestCase
       should "scroll through the index and save batches in bulk" do
         client  = mock()
         subject = Elasticsearch::Extensions::Reindex.new source: { index: 'foo', client: client },
-                                                         target: { index: 'bar' }
+                                                         dest: { index: 'bar' }
 
         client.expects(:search)
           .returns({ '_scroll_id' => 'scroll_id_1' }.merge(Marshal.load(Marshal.dump(@default_response))))
@@ -70,7 +87,7 @@ class Elasticsearch::Extensions::ReindexTest < Elasticsearch::Test::UnitTestCase
       should "return the number of errors" do
         client  = mock()
         subject = Elasticsearch::Extensions::Reindex.new source: { index: 'foo', client: client },
-                                                         target: { index: 'bar' }
+                                                         dest: { index: 'bar' }
 
         client.expects(:search).returns({ '_scroll_id' => 'scroll_id_1' }.merge(@default_response))
         client.expects(:scroll).returns(@empty_response)
@@ -85,7 +102,7 @@ class Elasticsearch::Extensions::ReindexTest < Elasticsearch::Test::UnitTestCase
         client  = mock()
         subject = Elasticsearch::Extensions::Reindex.new \
           source: { index: 'foo', client: client },
-          target: { index: 'bar' },
+          dest: { index: 'bar' },
           transform: lambda { |d| d['_source']['foo'].upcase!; d }
 
         client.expects(:search).returns({ '_scroll_id' => 'scroll_id_1' }.merge(@default_response))

data/test/test/cluster/integration/cluster_test.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you 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.
+
 require 'test_helper'
 require 'pathname'