elasticsearch 7.17.1 → 8.1.0

data/spec/unit/headers_spec.rb

@@ -0,0 +1,55 @@
+# 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 'spec_helper'
+require 'ostruct'
+
+describe Elasticsearch::Client do
+  context 'when a header is set on an endpoint request' do
+    let(:client) { described_class.new }
+    let(:headers) { { 'user-agent' => 'my ruby app' } }
+
+    it 'performs the request with the header' do
+      allow(client).to receive(:perform_request) { OpenStruct.new(body: '') }
+      expect { client.search(headers: headers) }.not_to raise_error
+      expect(client).to have_received(:perform_request)
+        .with('GET', '_search', {}, nil, headers)
+    end
+  end
+
+  context 'when a header is set on an endpoint request and on initialization' do
+    let!(:client) do
+      described_class.new(
+        host: 'http://localhost:9200',
+        transport_options: { headers: instance_headers }
+      ).tap do |client|
+        client.instance_variable_set('@verified', true)
+      end
+    end
+    let(:instance_headers) { { set_in_instantiation: 'header value' } }
+    let(:param_headers) { { 'user-agent' => 'My Ruby Tests', 'set-on-method-call' => 'header value' } }
+
+    it 'performs the request with the header' do
+      expected_headers = client.transport.connections.connections.first.connection.headers.merge(param_headers)
+
+      expect_any_instance_of(Faraday::Connection)
+        .to receive(:run_request)
+          .with(:get, 'http://localhost:9200/_search', nil, expected_headers) { OpenStruct.new(body: '') }
+
+      client.search(headers: param_headers)
+    end
+  end
+end

data/spec/unit/opaque_id_spec.rb

@@ -0,0 +1,48 @@
+# 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 'spec_helper'
+require 'ostruct'
+
+describe Elasticsearch::Client do
+  let(:transport) { client.instance_variable_get('@transport') }
+  let(:client) { described_class.new.tap { |cl| cl.instance_variable_set('@verified', true) } }
+
+  before do
+    allow(transport).to receive(:perform_request) { OpenStruct.new(body: '') }
+  end
+
+  context 'when x-opaque-id is set' do
+    it 'uses x-opaque-id on a request' do
+      client.search(opaque_id: '12345')
+      expect(transport).to have_received(:perform_request)
+        .with('GET', '_search', {}, nil, { 'X-Opaque-Id' => '12345' })
+    end
+  end
+
+  context 'when an x-opaque-id prefix is set on initialization' do
+    let(:prefix) { 'elastic_cloud' }
+    let(:client) do
+      described_class.new(opaque_id_prefix: prefix).tap { |cl| cl.instance_variable_set('@verified', true) }
+    end
+
+    it 'uses x-opaque-id on a request' do
+      expect { client.search(opaque_id: '12345') }.not_to raise_error
+      expect(transport).to have_received(:perform_request)
+        .with('GET', '_search', {}, nil, { 'X-Opaque-Id' => 'elastic_cloud12345' })
+    end
+  end
+end

data/spec/unit/wrapper_gem_spec.rb

@@ -14,13 +14,13 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-require 'elasticsearch'
-require 'webmock/rspec'
+
+require 'spec_helper'
 
 describe 'Elasticsearch: wrapper gem' do
   it 'requires all neccessary subgems' do
-    expect(defined?(Elasticsearch::Client))
-    expect(defined?(Elasticsearch::API))
+    expect(defined? Elasticsearch::Client)
+    expect(defined? Elasticsearch::API)
   end
 
   it 'mixes the API into the client' do
@@ -30,10 +30,4 @@ describe 'Elasticsearch: wrapper gem' do
     expect(client).to respond_to(:cluster)
     expect(client).to respond_to(:indices)
   end
-
-  it 'can access the client transport' do
-    client = Elasticsearch::Client.new
-    expect(client.transport).to be_a(Elasticsearch::Transport::Client)
-    expect(client.transport.transport).to be_a(Elasticsearch::Transport::Transport::HTTP::Faraday)
-  end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.17.1
+  version: 8.1.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: elasticsearch-transport
+  name: elastic-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.17.1
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.17.1
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.17.1
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.17.1
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: require-prof
   requirement: !ruby/object:Gem::Requirement
@@ -188,11 +188,11 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
-- LICENSE
+- LICENSE.txt
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/elastic_ruby_console
@@ -202,17 +202,21 @@ files:
 - lib/elasticsearch/version.rb
 - spec/integration/characters_escaping_spec.rb
 - spec/integration/client_integration_spec.rb
-- spec/integration/validation_integration_spec.rb
 - spec/spec_helper.rb
+- spec/unit/api_key_spec.rb
+- spec/unit/cloud_credentials_spec.rb
+- spec/unit/custom_transport_implementation_spec.rb
 - spec/unit/elasticsearch_product_validation_spec.rb
+- spec/unit/headers_spec.rb
+- spec/unit/opaque_id_spec.rb
 - spec/unit/wrapper_gem_spec.rb
-homepage: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html
+homepage: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/index.html
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html
-  changelog_uri: https://github.com/elastic/elasticsearch-ruby/blob/7.16/CHANGELOG.md
-  source_code_uri: https://github.com/elastic/elasticsearch-ruby/tree/7.16
+  homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/index.html
+  changelog_uri: https://github.com/elastic/elasticsearch-ruby/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/elastic/elasticsearch-ruby/tree/main
   bug_tracker_uri: https://github.com/elastic/elasticsearch-ruby/issues
 post_install_message: 
 rdoc_options:
@@ -223,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -237,7 +241,11 @@ summary: Ruby integrations for Elasticsearch
 test_files:
 - spec/integration/characters_escaping_spec.rb
 - spec/integration/client_integration_spec.rb
-- spec/integration/validation_integration_spec.rb
 - spec/spec_helper.rb
+- spec/unit/api_key_spec.rb
+- spec/unit/cloud_credentials_spec.rb
+- spec/unit/custom_transport_implementation_spec.rb
 - spec/unit/elasticsearch_product_validation_spec.rb
+- spec/unit/headers_spec.rb
+- spec/unit/opaque_id_spec.rb
 - spec/unit/wrapper_gem_spec.rb

data/spec/integration/validation_integration_spec.rb

@@ -1,30 +0,0 @@
-# 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 'spec_helper'
-require 'logger'
-
-describe 'Elasticsearch validation integration' do
-  it 'Validates for Elasticsearch > 7.14' do
-    client = Elasticsearch::Client.new(
-      host: ELASTICSEARCH_URL,
-      logger: Logger.new($stderr)
-    )
-    expect(client.instance_variable_get('@verified')).to be false
-    client.count
-    expect(client.instance_variable_get('@verified')).to be true
-  end
-end