Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions elasticsearch-api/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in elasticsearch-api.gemspec
gemspec

if File.exist? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __dir__)
gem 'elasticsearch', path: File.expand_path('../../elasticsearch', __dir__), require: false
if File.exist? File.expand_path('../elasticsearch/elasticsearch.gemspec', __dir__)
gem 'elasticsearch', path: File.expand_path('../elasticsearch', __dir__), require: false
end

group :development do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,19 @@ def delete_ruleset(arguments = {})

method = Elasticsearch::API::HTTP_DELETE
path = "_query_rules/#{Utils.__listify(_ruleset_id)}"
params = {}
params = Utils.process_params(arguments)

Elasticsearch::API::Response.new(
perform_request(method, path, params, body, headers, request_opts)
)
if Array(arguments[:ignore]).include?(404)
Utils.__rescue_from_not_found do
Elasticsearch::API::Response.new(
perform_request(method, path, params, body, headers, request_opts)
)
end
else
Elasticsearch::API::Response.new(
perform_request(method, path, params, body, headers, request_opts)
)
end
end
end
end
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# 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.
#
# Auto generated from build hash f284cc16f4d4b4289bc679aa1529bb504190fe80
# @see https://github.com/elastic/elasticsearch/tree/main/rest-api-spec
#
module Elasticsearch
module API
module QueryRules
module Actions
# Tests a query ruleset to identify the rules that would match input criteria
# This functionality is Experimental and may be changed or removed
# completely in a future release. Elastic will take a best effort approach
# to fix any issues, but experimental features are not subject to the
# support SLA of official GA features.
#
# @option arguments [String] :ruleset_id The unique identifier of the ruleset to test.
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The match criteria to test against the ruleset (*Required*)
#
# @see https://www.elastic.co/guide/en/elasticsearch/reference/8.16/test-query-ruleset.html
#
def test(arguments = {})
request_opts = { endpoint: arguments[:endpoint] || 'query_rules.test' }

defined_params = [:ruleset_id].each_with_object({}) do |variable, set_variables|
set_variables[variable] = arguments[variable] if arguments.key?(variable)
end
request_opts[:defined_params] = defined_params unless defined_params.empty?

raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
raise ArgumentError, "Required argument 'ruleset_id' missing" unless arguments[:ruleset_id]

arguments = arguments.clone
headers = arguments.delete(:headers) || {}

body = arguments.delete(:body)

_ruleset_id = arguments.delete(:ruleset_id)

method = Elasticsearch::API::HTTP_POST
path = "_query_rules/#{Utils.__listify(_ruleset_id)}/_test"
params = {}

Elasticsearch::API::Response.new(
perform_request(method, path, params, body, headers, request_opts)
)
end
end
end
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# 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'

describe 'client.query_rules#test' do
let(:expected_args) do
[
'POST',
'_query_rules/foo/_test',
{},
{},
{},
{ defined_params: { ruleset_id: 'foo' }, endpoint: 'query_rules.test' }
]
end

it 'performs the request' do
expect(client_double.query_rules.test(ruleset_id: 'foo', body: {})).to be_a Elasticsearch::API::Response
end
end
1 change: 1 addition & 0 deletions elasticsearch-api/utils/thor/endpoint_specifics.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ module EndpointSpecifics
indices.delete
indices.delete_template
indices.flush_synced
query_rules.delete_ruleset
security.get_role
security.get_user
snapshot.delete
Expand Down
1 change: 1 addition & 0 deletions elasticsearch/lib/elasticsearch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ def elasticsearch_validation_request

def sent_user_agent?(arguments)
return unless (headers = arguments&.[](:transport_options)&.[](:headers))

!!headers.keys.detect { |h| h =~ /user-?_?agent/ }
end

Expand Down