elastic-enterprise-search 7.12.1 → 7.15.0

data/lib/elastic/app-search/api/put_crawler_domain.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# 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 Elastic
+  module EnterpriseSearch
+    module AppSearch
+      module Actions
+        # Crawler - Update domain configuration
+        # Updates crawler domain configuration for a given domain
+        #
+        # @param engine_name [String] Name of the engine (*Required*)
+        # @param arguments [Hash] endpoint arguments
+        # @option arguments [String] :domain_id Crawler Domain ID (*Required*)
+        # @option arguments [Hash] :body
+        # @option body [String] :name
+        # @option body [Array] :entry_points
+        # @option body [Array] :crawl_rules
+        # @option body [Array] :sitemaps
+        # @option arguments [Hash] :headers optional HTTP headers to send with the request
+        #
+        # @see https://www.elastic.co/guide/en/app-search/current/web-crawler-api-reference.html#web-crawler-apis-put-crawler-domain
+        #
+        def put_crawler_domain(engine_name, arguments = {})
+          raise ArgumentError, "Required parameter 'engine_name' missing" unless engine_name
+          raise ArgumentError, "Required parameter 'domain_id' missing" unless arguments[:domain_id]
+
+          domain_id = arguments[:domain_id]
+          body = arguments.delete(:body) || {}
+          headers = arguments.delete(:headers) || {}
+
+          request(
+            :put,
+            "api/as/v0/engines/#{engine_name}/crawler/domains/#{domain_id}/",
+            arguments,
+            body,
+            headers
+          )
+        end
+      end
+    end
+  end
+end

data/lib/elastic/app-search/api/put_crawler_entry_point.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# 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 Elastic
+  module EnterpriseSearch
+    module AppSearch
+      module Actions
+        # Crawler - Update a crawler entry point
+        # Updates a crawler entry point with a new value
+        #
+        # @param engine_name [String] Name of the engine (*Required*)
+        # @param arguments [Hash] endpoint arguments
+        # @option arguments [String] :domain_id Crawler Domain ID (*Required*)
+        # @option arguments [String] :entry_point_id Crawler Entry Point identifier (*Required*)
+        # @option arguments [Hash] :body  (Required: value)
+        # @option body [String] :id
+        # @option body [String] :value  (*Required)
+        # @option arguments [Hash] :headers optional HTTP headers to send with the request
+        #
+        # @see https://www.elastic.co/guide/en/app-search/current/web-crawler-api-reference.html#web-crawler-apis-put-entry-point
+        #
+        def put_crawler_entry_point(engine_name, arguments = {})
+          raise ArgumentError, "Required parameter 'engine_name' missing" unless engine_name
+          raise ArgumentError, "Required parameter 'domain_id' missing" unless arguments[:domain_id]
+          raise ArgumentError, "Required parameter 'entry_point_id' missing" unless arguments[:entry_point_id]
+
+          domain_id = arguments[:domain_id]
+          entry_point_id = arguments[:entry_point_id]
+          body = arguments.delete(:body) || {}
+          headers = arguments.delete(:headers) || {}
+
+          request(
+            :put,
+            "api/as/v0/engines/#{engine_name}/crawler/domains/#{domain_id}/entry_points/#{entry_point_id}/",
+            arguments,
+            body,
+            headers
+          )
+        end
+      end
+    end
+  end
+end

data/lib/elastic/app-search/api/put_crawler_sitemap.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# 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 Elastic
+  module EnterpriseSearch
+    module AppSearch
+      module Actions
+        # Crawler - Update a sitemap
+        # Updates sitemap configuration
+        #
+        # @param engine_name [String] Name of the engine (*Required*)
+        # @param arguments [Hash] endpoint arguments
+        # @option arguments [String] :domain_id Crawler Domain ID (*Required*)
+        # @option arguments [String] :sitemap_id Sitemap ID (*Required*)
+        # @option arguments [Hash] :body  (Required: url)
+        # @option body [String] :id
+        # @option body [String] :url  (*Required)
+        # @option arguments [Hash] :headers optional HTTP headers to send with the request
+        #
+        # @see https://www.elastic.co/guide/en/app-search/current/web-crawler-api-reference.html#web-crawler-apis-put-sitemap
+        #
+        def put_crawler_sitemap(engine_name, arguments = {})
+          raise ArgumentError, "Required parameter 'engine_name' missing" unless engine_name
+          raise ArgumentError, "Required parameter 'domain_id' missing" unless arguments[:domain_id]
+          raise ArgumentError, "Required parameter 'sitemap_id' missing" unless arguments[:sitemap_id]
+
+          domain_id = arguments[:domain_id]
+          sitemap_id = arguments[:sitemap_id]
+          body = arguments.delete(:body) || {}
+          headers = arguments.delete(:headers) || {}
+
+          request(
+            :put,
+            "api/as/v0/engines/#{engine_name}/crawler/domains/#{domain_id}/sitemaps/#{sitemap_id}/",
+            arguments,
+            body,
+            headers
+          )
+        end
+      end
+    end
+  end
+end

data/lib/elastic/app-search/api/put_curation.rb

@@ -21,21 +21,22 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Curations - Update an existing curation
+        # Curations - Update a curation
+        # Updates an existing curation
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [Array] :queries List of affected search queries (*Required*)
-        # @option arguments [String] :curation_id  (*Required*)
-        # @option arguments :promoted_doc_ids List of promoted document IDs
-        # @option arguments :hidden_doc_ids List of hidden document IDs
-        # @option arguments [Hash] :body The request body
+        # @option arguments [String] :curation_id Curation ID (*Required*)
+        # @option arguments [Hash] :body  (Required: queries)
+        # @option body [String] :id
+        # @option body [Array] :queries List of affected search queries (*Required)
+        # @option body [Array] :promoted List of promoted document IDs
+        # @option body [Array] :hidden List of hidden document IDs
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/curations.html#curations-update
         #
         def put_curation(engine_name, arguments = {})
-          raise ArgumentError, "Required parameter 'queries' missing" unless arguments[:queries]
           raise ArgumentError, "Required parameter 'engine_name' missing" unless engine_name
           raise ArgumentError, "Required parameter 'curation_id' missing" unless arguments[:curation_id]
 

data/lib/elastic/app-search/api/put_documents.rb

@@ -22,17 +22,17 @@ module Elastic
     module AppSearch
       module Actions
         # Documents - Partial update of documents
+        # Update specific document fields by id and field
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [Array] :documents List of documents to update (*Required*)
+        # @option arguments [Array] :documents
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/documents.html#documents-partial
         #
         def put_documents(engine_name, arguments = {})
           raise ArgumentError, "Required parameter 'engine_name' missing" unless engine_name
-          raise ArgumentError, "Required parameter 'documents' missing" unless arguments[:documents]
 
           documents = arguments.delete(:documents) || {}
           headers = arguments.delete(:headers) || {}

data/lib/elastic/app-search/api/put_schema.rb

@@ -21,18 +21,18 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Schema - Update schema for the current engine
+        # Schema - Update engine schema
+        # Update schema for the current engine
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [Object] :schema Schema description (*Required*)
+        # @option arguments [Object] :schema
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/schema.html#schema-patch
         #
         def put_schema(engine_name, arguments = {})
           raise ArgumentError, "Required parameter 'engine_name' missing" unless engine_name
-          raise ArgumentError, "Required parameter 'schema' missing" unless arguments[:schema]
 
           schema = arguments.delete(:schema) || {}
           headers = arguments.delete(:headers) || {}

data/lib/elastic/app-search/api/put_search_settings.rb

@@ -23,9 +23,13 @@ module Elastic
       module Actions
         # Searchsettings - Update search settings for the engine
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [Object] :body Search settings (*Required*)
+        # @option arguments [Hash] :body
+        # @option body :boosts
+        # @option body :search_fields
+        # @option body :result_fields
+        # @option body [Integer] :precision
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/search-settings.html#search-settings-update

data/lib/elastic/app-search/api/put_synonym_set.rb

@@ -21,12 +21,15 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Synonyms - Update a synonym set by ID
+        # Synonyms - Update a synonym set
+        # Updates a synonym set by ID
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [String] :synonym_set_id  (*Required*)
-        # @option arguments [Object] :body Synonym set description (*Required*)
+        # @option arguments [String] :synonym_set_id Synonym Set ID (*Required*)
+        # @option arguments [Hash] :body  (Required: synonyms)
+        # @option body [String] :id
+        # @option body :synonyms  (*Required)
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/synonyms.html#synonyms-update
@@ -34,7 +37,7 @@ module Elastic
         def put_synonym_set(engine_name, arguments = {})
           raise ArgumentError, "Required parameter 'engine_name' missing" unless engine_name
           raise ArgumentError, "Required parameter 'synonym_set_id' missing" unless arguments[:synonym_set_id]
-          raise ArgumentError, "Required parameter 'body' missing" unless arguments[:body]
+          raise ArgumentError, "Required parameter 'body (synonyms)' missing" unless arguments[:body] || arguments[:synonyms]
 
           synonym_set_id = arguments[:synonym_set_id]
           body = arguments.delete(:body) || {}

data/lib/elastic/app-search/api/query_suggestion.rb

@@ -21,20 +21,20 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Querysuggestion - Provide relevant query suggestions for incomplete queries
+        # QuerySuggestion - Retrieve query suggestions
+        # Provide relevant query suggestions for incomplete queries
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [String] :query A partial query for which to receive suggestions (*Required*)
-        # @option arguments [Array] :fields List of fields to use to generate suggestions. Defaults to all text fields
-        # @option arguments [Integer] :size Number of query suggestions to return. Must be between 1 and 20. Defaults to 5
-        # @option arguments [Hash] :body The request body
+        # @option arguments [Hash] :body
+        # @option body [String] :query
+        # @option body :types
+        # @option body [Integer] :size
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/query-suggestion.html
         #
         def query_suggestion(engine_name, arguments = {})
-          raise ArgumentError, "Required parameter 'query' missing" unless arguments[:query]
           raise ArgumentError, "Required parameter 'engine_name' missing" unless engine_name
 
           body = arguments.delete(:body) || {}

data/lib/elastic/app-search/api/reset_search_settings.rb

@@ -21,9 +21,10 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Searchsettings - Reset search settings for the engine
+        # Synonyms - Reset search settings
+        # Resets search settings for the engine
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
         # @option arguments [Hash] :body The request body
         # @option arguments [Hash] :headers optional HTTP headers to send with the request

data/lib/elastic/app-search/api/schema.rb

@@ -21,9 +21,10 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Schema - Retrieve current schema for the engine
+        # Schema - Retrieve engine schema
+        # Retrieve current schema for the engine
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
         # @option arguments [Hash] :body The request body
         # @option arguments [Hash] :headers optional HTTP headers to send with the request

data/lib/elastic/app-search/api/search.rb

@@ -21,11 +21,22 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Search - Allows you to search over, facet and filter your data
+        # Search - Submit a search
+        # Submit a search and receive a set of results with meta data
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [Object] :body Search request parameters
+        # @option arguments [Hash] :body  (Required: query)
+        # @option body [String] :query  (*Required)
+        # @option body :analytics
+        # @option body :boost
+        # @option body :facets
+        # @option body :filters
+        # @option body :group
+        # @option body :page
+        # @option body :result_fields
+        # @option body :search_fields
+        # @option body :sort
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/search.html

data/lib/elastic/app-search/api/search_settings.rb

@@ -21,9 +21,10 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Searchsettings - Retrieve current search settings for the engine
+        # SearchSettings - Retrieve search settings
+        # Retrieve current search settings for the engine
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
         # @option arguments [Hash] :body The request body
         # @option arguments [Hash] :headers optional HTTP headers to send with the request

data/lib/elastic/app-search/api/synonym_set.rb

@@ -21,11 +21,12 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Synonyms - Retrieve a synonym set by ID
+        # Synonyms - Retrieve a synonym set
+        # Retrieves a synonym set by ID
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [String] :synonym_set_id  (*Required*)
+        # @option arguments [String] :synonym_set_id Synonym Set ID (*Required*)
         # @option arguments [Hash] :body The request body
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #

data/lib/elastic/app-search/api/top_clicks_analytics.rb

@@ -21,15 +21,15 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Analytics - Returns the number of clicks received by a document in descending order
+        # Analytics - Query for analytics click data
+        # Returns the number of clicks received by a document in descending order
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [String] :query Filter clicks over a search query
-        # @option arguments [Integer] :current_page The page to fetch. Defaults to 1
-        # @option arguments [Integer] :page_size The number of results per page
-        # @option arguments [Array] :filters Analytics filters
-        # @option arguments [Hash] :body The request body
+        # @option arguments [Hash] :body
+        # @option body [String] :query
+        # @option body :filters
+        # @option body [Object] :page
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/clicks.html
@@ -41,7 +41,7 @@ module Elastic
           headers = arguments.delete(:headers) || {}
 
           request(
-            :get,
+            :post,
             "api/as/v1/engines/#{engine_name}/analytics/clicks/",
             arguments,
             body,

data/lib/elastic/app-search/api/top_queries_analytics.rb

@@ -21,14 +21,14 @@ module Elastic
   module EnterpriseSearch
     module AppSearch
       module Actions
-        # Analytics - Returns queries analytics by usage count
+        # Analytics - Query for analytics query data
+        # Returns queries analytics by usage count
         #
-        # @param engine_name [String]  (*Required*)
+        # @param engine_name [String] Name of the engine (*Required*)
         # @param arguments [Hash] endpoint arguments
-        # @option arguments [Integer] :current_page The page to fetch. Defaults to 1
-        # @option arguments [Integer] :page_size The number of results per page
-        # @option arguments [Array] :filters Analytics filters
-        # @option arguments [Hash] :body The request body
+        # @option arguments [Hash] :body
+        # @option body :filters
+        # @option body [Object] :page
         # @option arguments [Hash] :headers optional HTTP headers to send with the request
         #
         # @see https://www.elastic.co/guide/en/app-search/current/queries.html#queries-top-queries
@@ -40,7 +40,7 @@ module Elastic
           headers = arguments.delete(:headers) || {}
 
           request(
-            :get,
+            :post,
             "api/as/v1/engines/#{engine_name}/analytics/queries/",
             arguments,
             body,

data/lib/elastic/app-search/app_search.rb

@@ -25,20 +25,10 @@ module Elastic
     #
     # @see https://www.elastic.co/guide/en/app-search/current/index.html
     module AppSearch
-      # The Request module is included in the AppSearch Client to override
-      # EnterpriseSearch client's authentication method with App's
-      # authentication.
-      module Request
-        def setup_authentication_header
-          "Bearer #{http_auth}"
-        end
-      end
-
       # The App Search Client
       # Extends EnterpriseSearch client but overrides authentication to use access token.
       class Client < Elastic::EnterpriseSearch::Client
         include Elastic::EnterpriseSearch::AppSearch::Actions
-        include Elastic::EnterpriseSearch::AppSearch::Request
 
         # Create a new Elastic::EnterpriseSearch::AppSearch::Client client
         #

data/lib/elastic/enterprise-search/api/health.rb

@@ -23,6 +23,7 @@ module Elastic
       # Health - Get information on the health of a deployment and basic statistics around resource usage
       # Get information on the health of a deployment and basic statistics around resource usage
       #
+      # @param arguments [Hash] endpoint arguments
       # @option arguments [Hash] :headers optional HTTP headers to send with the request
       #
       # @see https://www.elastic.co/guide/en/enterprise-search/current/monitoring-apis.html#health-api-example

data/lib/elastic/enterprise-search/api/put_read_only.rb

@@ -23,6 +23,9 @@ module Elastic
       # Read-Only - Update the read-only flag's state
       # Update the read-only flag's state
       #
+      # @param arguments [Hash] endpoint arguments
+      # @option arguments [Hash] :body  (Required: enabled)
+      # @option body [Boolean] :enabled  (*Required)
       # @option arguments [Hash] :headers optional HTTP headers to send with the request
       #
       # @see https://www.elastic.co/guide/en/enterprise-search/current/read-only-api.html#setting-read-only-state

data/lib/elastic/enterprise-search/api/read_only.rb

@@ -23,6 +23,7 @@ module Elastic
       # Read-Only - Get the read-only flag's state
       # Get the read-only flag's state
       #
+      # @param arguments [Hash] endpoint arguments
       # @option arguments [Hash] :headers optional HTTP headers to send with the request
       #
       # @see https://www.elastic.co/guide/en/enterprise-search/current/read-only-api.html#getting-read-only-state

data/lib/elastic/enterprise-search/api/version.rb

@@ -23,6 +23,7 @@ module Elastic
       # Version - Get version information for this server
       # Get version information for this server
       #
+      # @param arguments [Hash] endpoint arguments
       # @option arguments [Hash] :headers optional HTTP headers to send with the request
       #
       # @see https://www.elastic.co/guide/en/enterprise-search/current/management-apis.html

data/lib/elastic/enterprise-search/client.rb

@@ -22,18 +22,6 @@ require 'elastic/enterprise-search/utils'
 require 'elasticsearch-transport'
 
 module Elastic
-  # If the version is X.X.X.pre/alpha/beta, use X.X.Xp for the meta-header:
-  def self.client_meta_version
-    regexp = /^([0-9]+\.[0-9]+\.[0-9]+)\.?([a-z0-9.-]+)?$/
-    match = Elastic::EnterpriseSearch::VERSION.match(regexp)
-    return "#{match[1]}p" if match[2]
-
-    Elastic::EnterpriseSearch::VERSION
-  end
-
-  META_HEADER_SERVICE_VERSION = [:ent, client_meta_version].freeze
-  ENTERPRISE_SERVICE_VERSION = [:ent, client_meta_version].freeze
-
   module EnterpriseSearch
     # API client for the {Elastic Enterprise Search API}[https://www.elastic.co/enterprise-search].
     # This is the main client from which the Workplace Search and App Search clients inherit.
@@ -95,10 +83,6 @@ module Elastic
         @options[:open_timeout] || DEFAULT_TIMEOUT
       end
 
-      def proxy
-        @options[:proxy]
-      end
-
       def overall_timeout
         (@options[:overall_timeout] || DEFAULT_TIMEOUT).to_f
       end

data/lib/elastic/enterprise-search/request.rb

@@ -46,11 +46,9 @@ module Elastic
       end
 
       # Construct and send a request to the API.
-      #
-      # @raise [Timeout::Error] when the timeout expires
       def request(method, path, params = {}, body = {}, headers = {})
         meta_headers = { authorization: decide_authorization(params), user_agent: request_user_agent }
-        headers = if headers.nil? || !headers.is_a?(Hash)
+        headers = if !headers.is_a?(Hash)
                     meta_headers
                   else
                     headers.merge(meta_headers)
@@ -60,6 +58,19 @@ module Elastic
       end
 
       def setup_authentication_header
+        if instance_of? Elastic::EnterpriseSearch::Client
+          basic_auth_header
+        else
+          case http_auth
+          when Hash
+            basic_auth_header
+          when String
+            "Bearer #{http_auth}"
+          end
+        end
+      end
+
+      def basic_auth_header
         credentials = Base64.strict_encode64("#{http_auth[:user]}:#{http_auth[:password]}")
         "Basic #{credentials}"
       end

data/lib/elastic/enterprise-search/version.rb

@@ -19,6 +19,6 @@
 
 module Elastic
   module EnterpriseSearch
-    VERSION = '7.12.1'
+    VERSION = '7.15.0'
   end
 end

data/lib/elastic/enterprise_search.rb

@@ -33,6 +33,17 @@ require 'elastic/workplace-search/workplace_search'
 require 'elastic/app-search/app_search'
 
 module Elastic
+  # If the version is X.X.X.pre/alpha/beta, use X.X.Xp for the meta-header:
+  def self.client_meta_version
+    regexp = /^([0-9]+\.[0-9]+\.[0-9]+)\.?([a-z0-9.-]+)?$/
+    match = Elastic::EnterpriseSearch::VERSION.match(regexp)
+    return "#{match[1]}p" if match[2]
+
+    Elastic::EnterpriseSearch::VERSION
+  end
+
+  ENTERPRISE_SERVICE_VERSION = [:ent, client_meta_version].freeze
+
   module EnterpriseSearch
   end
 end