opensearch-api 2.0.2 → 2.2.0

data/lib/opensearch/api/actions/snapshot/cleanup_repository.rb

@@ -31,7 +31,8 @@ module OpenSearch
         # Removes stale data from repository.
         #
         # @option arguments [String] :repository A repository name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
@@ -58,6 +59,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:cleanup_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :timeout
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/clone.rb

@@ -33,7 +33,8 @@ module OpenSearch
         # @option arguments [String] :repository A repository name
         # @option arguments [String] :snapshot The name of the snapshot to clone from
         # @option arguments [String] :target_snapshot The name of the cloned snapshot to create
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body The snapshot clone definition (*Required*)
         #
@@ -66,7 +67,8 @@ module OpenSearch
         #
         # @since 6.2.0
         ParamsRegistry.register(:clone, [
-          :master_timeout
+          :master_timeout,
+          :cluster_manager_timeout
         ].freeze)
       end
     end

data/lib/opensearch/api/actions/snapshot/create.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [String] :snapshot A snapshot name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Boolean] :wait_for_completion Should this request wait until the operation has completed before returning
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body The snapshot definition
@@ -63,6 +64,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:create, [
           :master_timeout,
+          :cluster_manager_timeout,
           :wait_for_completion
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/create_repository.rb

@@ -31,7 +31,8 @@ module OpenSearch
         # Creates a repository.
         #
         # @option arguments [String] :repository A repository name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Boolean] :verify Whether to verify the repository after creation
         # @option arguments [Hash] :headers Custom HTTP headers
@@ -61,6 +62,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:create_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :timeout,
           :verify
         ].freeze)

data/lib/opensearch/api/actions/snapshot/delete.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [String] :snapshot A snapshot name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Hash] :headers Custom HTTP headers
         #
         #
@@ -64,7 +65,8 @@ module OpenSearch
         #
         # @since 6.2.0
         ParamsRegistry.register(:delete, [
-          :master_timeout
+          :master_timeout,
+          :cluster_manager_timeout
         ].freeze)
       end
     end

data/lib/opensearch/api/actions/snapshot/delete_repository.rb

@@ -31,7 +31,8 @@ module OpenSearch
         # Deletes a repository.
         #
         # @option arguments [List] :repository Name of the snapshot repository to unregister. Wildcard (`*`) patterns are supported.
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
@@ -62,6 +63,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:delete_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :timeout
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/get.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [List] :snapshot A comma-separated list of snapshot names
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown
         # @option arguments [Boolean] :index_details Whether to include details of each index in the snapshot, if those details are available. Defaults to false.
         # @option arguments [Boolean] :include_repository Whether to include the repository name in the snapshot info. Defaults to true.
@@ -69,6 +70,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:get, [
           :master_timeout,
+          :cluster_manager_timeout,
           :ignore_unavailable,
           :index_details,
           :include_repository,

data/lib/opensearch/api/actions/snapshot/get_features.rb

@@ -30,7 +30,8 @@ module OpenSearch
       module Actions
         # Returns a list of features which can be snapshotted in this cluster.
         #
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Hash] :headers Custom HTTP headers
         #
         #
@@ -51,7 +52,8 @@ module OpenSearch
         #
         # @since 6.2.0
         ParamsRegistry.register(:get_features, [
-          :master_timeout
+          :master_timeout,
+          :cluster_manager_timeout
         ].freeze)
       end
     end

data/lib/opensearch/api/actions/snapshot/get_repository.rb

@@ -31,8 +31,8 @@ module OpenSearch
         # Returns information about a repository.
         #
         # @option arguments [List] :repository A comma-separated list of repository names
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
-        # @option arguments [Boolean] :local Return local information, do not retrieve the state from master node (default: false)
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to cluster_manager node
+        # @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
         # @option arguments [Hash] :headers Custom HTTP headers
         #
         #
@@ -64,6 +64,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:get_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :local
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/restore.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [String] :snapshot A snapshot name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Boolean] :wait_for_completion Should this request wait until the operation has completed before returning
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body Details of what to restore
@@ -63,6 +64,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:restore, [
           :master_timeout,
+          :cluster_manager_timeout,
           :wait_for_completion
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/status.rb

@@ -32,7 +32,8 @@ module OpenSearch
         #
         # @option arguments [String] :repository A repository name
         # @option arguments [List] :snapshot A comma-separated list of snapshot names
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown
         # @option arguments [Hash] :headers Custom HTTP headers
         #
@@ -69,6 +70,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:status, [
           :master_timeout,
+          :cluster_manager_timeout,
           :ignore_unavailable
         ].freeze)
       end

data/lib/opensearch/api/actions/snapshot/verify_repository.rb

@@ -31,7 +31,8 @@ module OpenSearch
         # Verifies a repository.
         #
         # @option arguments [String] :repository A repository name
-        # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+        # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
+        # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
@@ -58,6 +59,7 @@ module OpenSearch
         # @since 6.2.0
         ParamsRegistry.register(:verify_repository, [
           :master_timeout,
+          :cluster_manager_timeout,
           :timeout
         ].freeze)
       end

data/lib/opensearch/api/utils.rb

@@ -97,13 +97,13 @@ module OpenSearch
       # in a single item.
       #
       #     OpenSearch::API::Utils.__bulkify [
-      #       { :index =>  { :_index => 'myindexA', :_type => 'mytype', :_id => '1', :data => { :title => 'Test' } } },
-      #       { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } }
+      #       { :index =>  { :_index => 'myindexA', :_id => '1', :data => { :title => 'Test' } } },
+      #       { :update => { :_index => 'myindexB', :_id => '2', :data => { :doc => { :title => 'Update' } } } }
       #     ]
       #
-      #     # => {"index":{"_index":"myindexA","_type":"mytype","_id":"1"}}
+      #     # => {"index":{"_index":"myindexA","_id":"1"}}
       #     # => {"title":"Test"}
-      #     # => {"update":{"_index":"myindexB","_type":"mytype","_id":"2"}}
+      #     # => {"update":{"_index":"myindexB","_id":"2"}}
       #     # => {"doc":{"title":"Update"}}
       #
       def __bulkify(payload)

data/lib/opensearch/api/version.rb

@@ -26,6 +26,6 @@
 
 module OpenSearch
   module API
-    VERSION = '2.0.2'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/opensearch-api.gemspec

@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'ansi'
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'opensearch'
+  s.add_development_dependency 'opensearch-ruby', '~> 2'
   s.add_development_dependency 'opensearch-transport'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-reporters'
@@ -86,6 +86,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ruby-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
 
   s.description = <<-DESC.gsub(/^    /, '')
-    Ruby API for OpenSearch. See the `opensearch` gem for full integration.
+    Ruby API for OpenSearch. See the `opensearch-ruby` gem for full integration.
   DESC
 end

data/spec/opensearch/api/actions/cat/all_pit_segments_spec.rb

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client.cat#all_pit_segments' do
+
+  let(:expected_args) do
+    [
+      'GET',
+      '_cat/pit_segments/_all',
+      {},
+      nil,
+      {}
+    ]
+  end
+  let(:client) do
+    Class.new { include OpenSearch::API }.new
+  end
+
+  it 'does not accept unregistered params' do
+    expect {
+      client.cat.all_pit_segments(something: :else)
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'performs the request' do
+    expect(client_double.cat.all_pit_segments).to eq({})
+  end
+end

data/spec/opensearch/api/actions/cat/allocation_spec.rb

@@ -27,18 +27,17 @@
 require 'spec_helper'
 
 describe 'client.cat#allocation' do
-
   let(:expected_args) do
     [
-        'GET',
-        '_cat/allocation',
-        {},
-        nil,
-        {}
+      'GET',
+      '_cat/allocation',
+      {cluster_manager_timeout: 2},
+      nil,
+      {}
     ]
   end
 
   it 'performs the request' do
-    expect(client_double.cat.allocation).to eq({})
+    expect(client_double.cat.allocation(cluster_manager_timeout: 2)).to eq({})
   end
 end

data/spec/opensearch/api/actions/cat/cluster_manager_spec.rb

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client.cat#cluster_manager' do
+  let(:expected_args) do
+    [
+      'GET',
+      '_cat/cluster_manager',
+      {},
+      nil,
+      {}
+    ]
+  end
+
+  it 'performs the request' do
+    expect(client_double.cat.cluster_manager).to eq({})
+  end
+end

data/spec/opensearch/api/actions/cat/pit_segments_spec.rb

@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client.cat#pit_segments' do
+
+  let(:expected_args) do
+    [
+      'GET',
+      '_cat/pit_segments',
+      {},
+      { pit_id: ['abc'] },
+      {}
+    ]
+  end
+
+  let(:client) do
+    Class.new { include OpenSearch::API }.new
+  end
+
+  it 'requires the :body argument' do
+    expect {
+      client.cat.pit_segments
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'does not accept unregistered params' do
+    expect {
+      client.cat.pit_segments(body: {}, something: :else)
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'performs the request' do
+    expect(client_double.cat.pit_segments(body: { pit_id: ['abc'] })).to eq({})
+  end
+end

data/spec/opensearch/api/actions/create_pit_spec.rb

@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client#create_pit' do
+  let(:expected_args) do
+    [
+      'POST',
+      'movies,books/_search/point_in_time',
+      { keep_alive: '1m',
+        preference: :random,
+        routing: :route,
+        expand_wildcards: :open,
+        allow_partial_pit_creation: false },
+      nil
+    ]
+  end
+
+  let(:client) do
+    Class.new { include OpenSearch::API }.new
+  end
+
+  it 'requires the :index argument' do
+    expect {
+      client.create_pit(keep_alive: '1m')
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'requires the :index argument' do
+    expect {
+      client.create_pit(index: 'movies')
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'does not accept unregistered params' do
+    expect {
+      client.create_pit(index: 'movies', keep_alive: '1m', something: 42)
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'performs the request with all optional params' do
+    expect(client_double.create_pit(
+      index: %w[movies books],
+      keep_alive: '1m',
+      preference: :random,
+      routing: :route,
+      expand_wildcards: :open,
+      allow_partial_pit_creation: false
+    )).to eq({})
+  end
+end

data/spec/opensearch/api/actions/delete_all_pits_spec.rb

@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client#delete_all_pits' do
+  let(:expected_args) do
+    [
+      'DELETE',
+      '_search/point_in_time/_all',
+      {},
+      nil
+    ]
+  end
+
+  let(:client) do
+    Class.new { include OpenSearch::API }.new
+  end
+
+  it 'does not accept unregistered params' do
+    expect {
+      client.delete_all_pits(something: :else)
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'performs the request with all optional params' do
+    expect(client_double.delete_all_pits).to eq({})
+  end
+end

data/spec/opensearch/api/actions/delete_pit_spec.rb

@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client#delete_pit' do
+  let(:expected_args) do
+    [
+      'DELETE',
+      '_search/point_in_time',
+      {},
+      { pit_id: ['abc'] }
+    ]
+  end
+
+  let(:client) do
+    Class.new { include OpenSearch::API }.new
+  end
+
+  it 'requires the :body argument' do
+    expect {
+      client.delete_pit
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'does not accept unregistered params' do
+    expect {
+      client.delete_pit(body: {}, something: :else)
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'performs the request with all optional params' do
+    expect(client_double.delete_pit(body: { pit_id: ['abc'] })).to eq({})
+  end
+end

data/spec/opensearch/api/actions/get_all_pits_spec.rb

@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+
+require 'spec_helper'
+
+describe 'client#get_all_pits' do
+  let(:expected_args) do
+    [
+      'GET',
+      '_search/point_in_time/_all',
+      {},
+      nil
+    ]
+  end
+
+  let(:client) do
+    Class.new { include OpenSearch::API }.new
+  end
+
+  it 'does not accept unregistered params' do
+    expect {
+      client.get_all_pits(something: :else)
+    }.to raise_exception(ArgumentError)
+  end
+
+  it 'performs the request with all optional params' do
+    expect(client_double.get_all_pits).to eq({})
+  end
+end

data/spec/opensearch/api/actions/get_script_spec.rb

@@ -49,11 +49,11 @@ describe 'client#get_script' do
   context 'when the `lang` parameter is specificed' do
 
     let(:params) do
-      { master_timeout: '1s' }
+      { cluster_manager_timeout: '1s' }
     end
 
     it 'performs the request' do
-      expect(client_double.get_script(master_timeout: '1s', id: 'foo')).to eq({})
+      expect(client_double.get_script(cluster_manager_timeout: '1s', id: 'foo')).to eq({})
     end
   end
 end

data/spec/opensearch/api/actions/hashie_spec.rb

@@ -45,7 +45,6 @@ describe 'Hashie' do
                 "hits": [
                   {
                     "_index": "myindex",
-                    "_type": "mytype",
                     "_id": "1",
                     "_score": 0.51104903,
                     "_source": {
@@ -63,7 +62,6 @@ describe 'Hashie' do
               },
               "facets": {
                 "tags": {
-                  "_type": "terms",
                   "missing": 0,
                   "total": 10,
                   "other": 0,

data/spec/opensearch/api/actions/indices/clone_spec.rb

@@ -88,7 +88,7 @@ describe 'client.indices#clone' do
     let(:params) do
       {
           timeout: '1s',
-          master_timeout: '10s',
+          cluster_manager_timeout: '10s',
           wait_for_active_shards: 1
       }
     end
@@ -97,7 +97,7 @@ describe 'client.indices#clone' do
       expect(client_double.indices.clone(index: 'my_source_index',
                                          target: 'my_target_index',
                                          timeout: '1s',
-                                         master_timeout: '10s',
+                                         cluster_manager_timeout: '10s',
                                          wait_for_active_shards: 1)).to eq({})
     end
   end

data/spec/opensearch/api/utils_spec.rb

@@ -109,19 +109,19 @@ describe OpenSearch::API::Utils do
 
       let(:result) do
         utils.__bulkify [
-          { :index =>  { :_index => 'myindexA', :_type => 'mytype', :_id => '1', :data => { :title => 'Test' } } },
-          { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
-          { :delete => { :_index => 'myindexC', :_type => 'mytypeC', :_id => '3' } }
+          { :index =>  { :_index => 'myindexA', :_id => '1', :data => { :title => 'Test' } } },
+          { :update => { :_index => 'myindexB', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
+          { :delete => { :_index => 'myindexC', :_id => '3' } }
         ]
       end
 
       let(:expected_string) do
         <<-PAYLOAD.gsub(/^\s+/, '')
-                {"index":{"_index":"myindexA","_type":"mytype","_id":"1"}}
+                {"index":{"_index":"myindexA","_id":"1"}}
                 {"title":"Test"}
-                {"update":{"_index":"myindexB","_type":"mytype","_id":"2"}}
+                {"update":{"_index":"myindexB","_id":"2"}}
                 {"doc":{"title":"Update"}}
-                {"delete":{"_index":"myindexC","_type":"mytypeC","_id":"3"}}
+                {"delete":{"_index":"myindexC","_id":"3"}}
         PAYLOAD
       end