elasticsearch-api 8.5.0 → 8.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a93e7def7192582d7c79489a2ad2953b23d41fa75c49f81e93ad717d951e6d2a
-  data.tar.gz: 8ecf595ae67b718028e6da5792b708a1439dc5e0522dab7d4da3f4b251541d83
+  metadata.gz: 83bd8be41d9f67d39e9cdb030e2ea2286c08bc4fbcdcf23db15a85a533e4f954
+  data.tar.gz: d4185c7fca5cb11fce5da43e36ebc44ab27086eb4c62a26541baa5414478fed0
 SHA512:
-  metadata.gz: b6bb3945019969e536124a24ecee54e3eea42b1a6b7bfd24e3d49fb9f8fa8b58753224361e24560802eef8713fefb565553d9959e171898d8c9f737eb3b0941f
-  data.tar.gz: 361a85f3cba1eaa248947475a53531070916567669365306feaaee88274c8c52d49c21f36b91a28447837a6dfd1a20c1bad55af08e493533ff07baa02cd17269
+  metadata.gz: 4dda71b331ae5d4b5aa01a4871cb0495961117332a7f72c8dc96143922402fbaef942c921f950ff373ca5e2a82e2a8ad2a86dc6a27db49ee10be73982ce1cc0a
+  data.tar.gz: 3c72b61e3baaacee6abffc54b50da5c0bcda47e3ffd1669f9c0623343294b1025f63de6f13b815a73ccf30a842098b80f9756b2efd0c96ba5fc090f920cd800d

data/api-spec-testing/rspec_matchers.rb

@@ -42,6 +42,14 @@ end
 # Validate that a field is `true`.
 RSpec::Matchers.define :match_true_field do |field, test|
   match do |response|
+    # TODO: Refactor! split_key for is_true
+    if (match = field.match(/(^\$[a-z]+)/))
+      keys = field.split('.')
+      keys.delete(match[1])
+      dynamic_key = test.cached_values[match[1].gsub('$', '')]
+      return !!dynamic_key.dig(*keys)
+    end
+
     # Handle is_true: ''
     return !!response if field == ''
 
@@ -190,10 +198,24 @@ RSpec::Matchers.define :match_response do |pairs, test|
 
   def compare_hash(expected_pairs, actual_hash, test)
     expected_pairs.each do |expected_key, expected_value|
-      # Find the value to compare in the response
-      split_key = TestFile::Test.split_and_parse_key(expected_key).collect do |k|
-        # Sometimes the expected *key* is a cached value from a previous request.
-        test.get_cached_value(k)
+      # TODO: Refactor! split_key
+      if (match = expected_key.match(/(^\$[a-z]+)/))
+        keys = expected_key.split('.')
+        keys.delete(match[1])
+        dynamic_key = test.cached_values[match[1].gsub('$', '')]
+        value = dynamic_key.dig(*keys)
+
+        if expected_pairs.values.first.is_a?(String) && expected_pairs.values.first.match?(/^\$/)
+          return test.cached_values[expected_pairs.values.first.gsub('$','')] == value
+        else
+          return expected_pairs.values.first == value
+        end
+
+      else
+        split_key = TestFile::Test.split_and_parse_key(expected_key).collect do |k|
+          # Sometimes the expected *key* is a cached value from a previous request.
+          test.get_cached_value(k)
+        end
       end
       # We now accept 'nested.keys' so let's try the previous implementation and if that doesn't
       # work, try with the nested key, otherwise, raise exception.

data/api-spec-testing/test_file/action.rb

@@ -122,6 +122,12 @@ module Elasticsearch
                 @response = client.send(_method, prepare_arguments(args, test))
               end
               client
+            when 'update_user_profile_data', 'get_user_profile', 'enable_user_profile', 'disable_user_profile'
+              args.each do |key, value|
+                args[key] = value.gsub(value, test.cached_values[value.gsub('$', '')]) if value.match?(/^\$/)
+              end
+              @response = client.send(_method, prepare_arguments(args, test))
+              client
             else
               @response = client.send(_method, prepare_arguments(args, test))
               client

data/lib/elasticsearch/api/actions/security/create_service_token.rb

@@ -47,7 +47,7 @@ module Elasticsearch
 
           _name = arguments.delete(:name)
 
-          method = Elasticsearch::API::HTTP_PUT
+          method = _name ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST
           path   = if _namespace && _service && _name
                      "_security/service/#{Utils.__listify(_namespace)}/#{Utils.__listify(_service)}/credential/token/#{Utils.__listify(_name)}"
                    else

data/lib/elasticsearch/api/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module API
-    VERSION = '8.5.0'.freeze
+    VERSION = '8.5.2'.freeze
   end
 end

data/spec/elasticsearch/api/actions/security/create_service_token_spec.rb

@@ -18,16 +18,31 @@
 require 'spec_helper'
 
 describe 'client#security#create_service_token' do
+  let(:expected_path) { '_security/service/foo/bar/credential/token' }
+  let(:expected_request_method) { 'POST' }
   let(:expected_args) do
     [
-      'PUT',
-      '_security/service/foo/bar/credential/token',
+      expected_request_method,
+      expected_path,
       {},
       nil,
       {}
     ]
   end
 
+  context 'with token name' do
+    let(:expected_request_method) { 'PUT' }
+    let(:token_name) { 'test-token' }
+    let(:expected_path) { "#{super()}/#{token_name}" }
+    it 'performs the request' do
+      expect(
+        client_double.security.create_service_token(
+          namespace: 'foo', service: 'bar', name: token_name
+        )
+      ).to be_a Elasticsearch::API::Response
+    end
+  end
+
   it 'performs the request' do
     expect(
       client_double.security.create_service_token(

data/utils/thor/generate_source.rb

@@ -171,6 +171,7 @@ module Elasticsearch
 
       def __http_method
         return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
+        return '_name ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @method_name == 'create_service_token'
         return post_and_get if @endpoint_name == 'count'
 
         default_method = @spec['url']['paths'].map { |a| a['methods'] }.flatten.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 8.5.0
+  version: 8.5.2
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json