elastic-enterprise-search 7.14.1 → 7.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.ci/functions/imports.sh +1 -0
- data/.ci/jobs/defaults.yml +4 -0
- data/.ci/run-repository.sh +2 -1
- data/.ci/test-matrix.yml +5 -3
- data/.github/workflows/testing.yml +1 -1
- data/Rakefile +19 -0
- data/docs/guide/app-search-api.asciidoc +129 -1
- data/docs/guide/release_notes/714.asciidoc +0 -12
- data/docs/guide/release_notes/715.asciidoc +36 -0
- data/docs/guide/release_notes/index.asciidoc +2 -0
- data/docs/guide/workplace-search-api.asciidoc +14 -0
- data/elastic-enterprise-search.gemspec +1 -1
- data/lib/elastic/app-search/api/add_meta_engine_source.rb +3 -2
- data/lib/elastic/app-search/api/api_key.rb +2 -1
- data/lib/elastic/app-search/api/api_logs.rb +14 -13
- data/lib/elastic/app-search/api/count_analytics.rb +7 -6
- data/lib/elastic/app-search/api/crawler_active_crawl_request.rb +51 -0
- data/lib/elastic/app-search/api/crawler_crawl_request.rb +54 -0
- data/lib/elastic/app-search/api/crawler_crawl_schedule.rb +51 -0
- data/lib/elastic/app-search/api/crawler_domain.rb +54 -0
- data/lib/elastic/app-search/api/crawler_domain_validation_result.rb +48 -0
- data/lib/elastic/app-search/api/crawler_metrics.rb +48 -0
- data/lib/elastic/app-search/api/crawler_overview.rb +51 -0
- data/lib/elastic/app-search/api/crawler_process_crawl.rb +54 -0
- data/lib/elastic/app-search/api/crawler_process_crawl_denied_urls.rb +54 -0
- data/lib/elastic/app-search/api/crawler_url_extraction_result.rb +52 -0
- data/lib/elastic/app-search/api/crawler_url_tracing_result.rb +52 -0
- data/lib/elastic/app-search/api/crawler_url_validation_result.rb +52 -0
- data/lib/elastic/app-search/api/crawler_user_agent.rb +48 -0
- data/lib/elastic/app-search/api/create_api_key.rb +9 -1
- data/lib/elastic/app-search/api/create_crawler_crawl_request.rb +51 -0
- data/lib/elastic/app-search/api/create_crawler_crawl_rule.rb +59 -0
- data/lib/elastic/app-search/api/create_crawler_domain.rb +55 -0
- data/lib/elastic/app-search/api/create_crawler_entry_point.rb +56 -0
- data/lib/elastic/app-search/api/create_crawler_process_crawl.rb +53 -0
- data/lib/elastic/app-search/api/create_crawler_sitemap.rb +56 -0
- data/lib/elastic/app-search/api/create_curation.rb +7 -6
- data/lib/elastic/app-search/api/create_engine.rb +9 -7
- data/lib/elastic/app-search/api/create_synonym_set.rb +7 -4
- data/lib/elastic/app-search/api/curation.rb +4 -3
- data/lib/elastic/app-search/api/delete_active_crawl_request.rb +51 -0
- data/lib/elastic/app-search/api/delete_api_key.rb +1 -0
- data/lib/elastic/app-search/api/delete_crawler_active_crawl_request.rb +51 -0
- data/lib/elastic/app-search/api/delete_crawler_crawl_rule.rb +57 -0
- data/lib/elastic/app-search/api/delete_crawler_crawl_schedule.rb +51 -0
- data/lib/elastic/app-search/api/delete_crawler_domain.rb +54 -0
- data/lib/elastic/app-search/api/delete_crawler_entry_point.rb +57 -0
- data/lib/elastic/app-search/api/delete_crawler_sitemap.rb +57 -0
- data/lib/elastic/app-search/api/delete_curation.rb +4 -3
- data/lib/elastic/app-search/api/delete_documents.rb +2 -1
- data/lib/elastic/app-search/api/delete_engine.rb +3 -2
- data/lib/elastic/app-search/api/delete_meta_engine_source.rb +3 -3
- data/lib/elastic/app-search/api/delete_synonym_set.rb +4 -3
- data/lib/elastic/app-search/api/denied_urls.rb +54 -0
- data/lib/elastic/app-search/api/documents.rb +3 -2
- data/lib/elastic/app-search/api/engine.rb +3 -2
- data/lib/elastic/app-search/api/index_documents.rb +3 -2
- data/lib/elastic/app-search/api/list_api_keys.rb +2 -1
- data/lib/elastic/app-search/api/list_crawler_crawl_requests.rb +52 -0
- data/lib/elastic/app-search/api/list_crawler_process_crawls.rb +51 -0
- data/lib/elastic/app-search/api/list_curations.rb +3 -2
- data/lib/elastic/app-search/api/list_documents.rb +3 -2
- data/lib/elastic/app-search/api/list_engines.rb +2 -1
- data/lib/elastic/app-search/api/list_synonym_sets.rb +3 -2
- data/lib/elastic/app-search/api/log_clickthrough.rb +8 -10
- data/lib/elastic/app-search/api/put_api_key.rb +9 -2
- data/lib/elastic/app-search/api/put_crawler_crawl_rule.rb +62 -0
- data/lib/elastic/app-search/api/put_crawler_crawl_schedule.rb +53 -0
- data/lib/elastic/app-search/api/put_crawler_domain.rb +58 -0
- data/lib/elastic/app-search/api/put_crawler_entry_point.rb +59 -0
- data/lib/elastic/app-search/api/put_crawler_sitemap.rb +59 -0
- data/lib/elastic/app-search/api/put_curation.rb +9 -8
- data/lib/elastic/app-search/api/put_documents.rb +3 -3
- data/lib/elastic/app-search/api/put_schema.rb +4 -4
- data/lib/elastic/app-search/api/put_search_settings.rb +6 -2
- data/lib/elastic/app-search/api/put_synonym_set.rb +8 -5
- data/lib/elastic/app-search/api/query_suggestion.rb +7 -7
- data/lib/elastic/app-search/api/reset_search_settings.rb +3 -2
- data/lib/elastic/app-search/api/schema.rb +3 -2
- data/lib/elastic/app-search/api/search.rb +14 -3
- data/lib/elastic/app-search/api/search_settings.rb +3 -2
- data/lib/elastic/app-search/api/synonym_set.rb +4 -3
- data/lib/elastic/app-search/api/top_clicks_analytics.rb +8 -8
- data/lib/elastic/app-search/api/top_queries_analytics.rb +7 -7
- data/lib/elastic/app-search/app_search.rb +0 -10
- data/lib/elastic/enterprise-search/api/health.rb +1 -0
- data/lib/elastic/enterprise-search/api/put_read_only.rb +3 -2
- data/lib/elastic/enterprise-search/api/read_only.rb +1 -0
- data/lib/elastic/enterprise-search/api/version.rb +1 -0
- data/lib/elastic/enterprise-search/client.rb +1 -12
- data/lib/elastic/enterprise-search/request.rb +10 -1
- data/lib/elastic/enterprise-search/version.rb +1 -1
- data/lib/elastic/workplace-search/api/auto_query_refinement_details.rb +49 -0
- data/lib/elastic/workplace-search/api/create_content_source.rb +1 -0
- data/lib/elastic/workplace-search/api/delete_synonym_set.rb +1 -1
- data/lib/elastic/workplace-search/api/put_content_source.rb +1 -0
- data/lib/elastic/workplace-search/api/put_synonym_set.rb +1 -1
- data/lib/elastic/workplace-search/api/put_triggers_blocklist.rb +47 -0
- data/lib/elastic/workplace-search/api/search.rb +3 -0
- data/lib/elastic/workplace-search/api/synonym_set.rb +1 -1
- data/{spec/app-search/api_logs_spec.rb → lib/elastic/workplace-search/api/triggers_blocklist.rb} +23 -14
- data/lib/elastic/workplace-search/workplace_search.rb +0 -15
- data/spec/integration/app-search/api_key_spec.rb +110 -0
- data/spec/integration/app-search/api_logs_spec.rb +59 -0
- data/spec/{app-search/api_spec_helper.rb → integration/app-search/app_search_helper.rb} +17 -8
- data/spec/integration/app-search/count_analytics_spec.rb +47 -0
- data/spec/integration/app-search/crawl_requests_spec.rb +86 -0
- data/spec/integration/app-search/crawler_crawl_rule_spec.rb +73 -0
- data/spec/integration/app-search/crawler_domain_spec.rb +82 -0
- data/spec/integration/app-search/crawler_entry_point_spec.rb +89 -0
- data/spec/integration/app-search/crawler_metrics_spec.rb +46 -0
- data/spec/integration/app-search/crawler_overview_spec.rb +45 -0
- data/spec/integration/app-search/crawler_process_crawl_denied_urls_spec.rb +50 -0
- data/spec/integration/app-search/crawler_process_crawl_spec.rb +66 -0
- data/spec/integration/app-search/crawler_scheduling_spec.rb +81 -0
- data/spec/integration/app-search/crawler_sitemap_spec.rb +72 -0
- data/spec/integration/app-search/crawler_urls_spec.rb +60 -0
- data/spec/{app-search/api_count_analytics_spec.rb → integration/app-search/crawler_user_agent_spec.rb} +6 -9
- data/spec/integration/app-search/curations_spec.rb +118 -0
- data/spec/integration/app-search/documents_spec.rb +123 -0
- data/spec/integration/app-search/engines_spec.rb +77 -0
- data/spec/{app-search/api_log_clickthrough_spec.rb → integration/app-search/log_clickthrough_spec.rb} +14 -7
- data/spec/integration/app-search/meta_engines_spec.rb +75 -0
- data/spec/integration/app-search/query_suggestion_spec.rb +50 -0
- data/spec/{app-search/api_schema_spec.rb → integration/app-search/schema_spec.rb} +21 -16
- data/spec/integration/app-search/search_and_multiple_search_spec.rb +67 -0
- data/spec/integration/app-search/search_settings_spec.rb +87 -0
- data/spec/integration/app-search/synonyms_spec.rb +79 -0
- data/spec/{app-search/api_top_clicks_analytics_spec.rb → integration/app-search/top_clicks_analytics_spec.rb} +20 -14
- data/spec/{app-search/api_top_queries_analytics_spec.rb → integration/app-search/top_queries_analytics_spec.rb} +16 -8
- data/spec/integration/workplace-search/content_sources_spec.rb +106 -0
- data/spec/integration/workplace-search/documents_spec.rb +95 -0
- data/spec/integration/workplace-search/external_identities_spec.rb +97 -0
- data/spec/integration/{icon.png → workplace-search/icon.png} +0 -0
- data/spec/integration/workplace-search/permissions_spec.rb +77 -0
- data/spec/integration/workplace-search/synonym_sets_spec.rb +92 -0
- data/spec/integration/workplace-search/triggers_spec.rb +43 -0
- data/spec/{app-search/api_query_suggestion_spec.rb → integration/workplace-search/users_spec.rb} +12 -15
- data/spec/integration/workplace-search/workplace_search_helper.rb +39 -0
- metadata +81 -68
- data/.github/compatibility/Gemfile +0 -23
- data/.github/workflows/compatibility.yml +0 -20
- data/spec/app-search/api_apikey_spec.rb +0 -92
- data/spec/app-search/api_curations_spec.rb +0 -97
- data/spec/app-search/api_documents_spec.rb +0 -102
- data/spec/app-search/api_engines_spec.rb +0 -67
- data/spec/app-search/api_meta_engines_spec.rb +0 -72
- data/spec/app-search/api_search_and_multi_search_spec.rb +0 -48
- data/spec/app-search/api_search_settings_spec.rb +0 -76
- data/spec/app-search/api_synonyms_spec.rb +0 -79
- data/spec/fixtures/vcr/app_search/add_meta_engine_source.yml +0 -109
- data/spec/fixtures/vcr/app_search/api_documents.yml +0 -56
- data/spec/fixtures/vcr/app_search/api_index_documents.yml +0 -57
- data/spec/fixtures/vcr/app_search/api_log_clickthrough.yml +0 -54
- data/spec/fixtures/vcr/app_search/api_logs.yml +0 -70
- data/spec/fixtures/vcr/app_search/api_put_schema.yml +0 -109
- data/spec/fixtures/vcr/app_search/api_put_search_settings.yml +0 -56
- data/spec/fixtures/vcr/app_search/api_query_suggestion.yml +0 -59
- data/spec/fixtures/vcr/app_search/api_reset_search_settings.yml +0 -56
- data/spec/fixtures/vcr/app_search/api_schema.yml +0 -56
- data/spec/fixtures/vcr/app_search/api_search_settings.yml +0 -56
- data/spec/fixtures/vcr/app_search/api_top_clicks_analytics.yml +0 -55
- data/spec/fixtures/vcr/app_search/api_top_clicks_analytics_query.yml +0 -55
- data/spec/fixtures/vcr/app_search/api_top_queries_analytics.yml +0 -55
- data/spec/fixtures/vcr/app_search/count_analytics.yml +0 -55
- data/spec/fixtures/vcr/app_search/create_and_update_document.yml +0 -107
- data/spec/fixtures/vcr/app_search/create_api_key.yml +0 -52
- data/spec/fixtures/vcr/app_search/create_curation.yml +0 -113
- data/spec/fixtures/vcr/app_search/create_engine.yml +0 -55
- data/spec/fixtures/vcr/app_search/create_meta_engine.yml +0 -56
- data/spec/fixtures/vcr/app_search/create_synonym_set.yml +0 -56
- data/spec/fixtures/vcr/app_search/delete_api_key.yml +0 -52
- data/spec/fixtures/vcr/app_search/delete_curation.yml +0 -56
- data/spec/fixtures/vcr/app_search/delete_engine.yml +0 -55
- data/spec/fixtures/vcr/app_search/delete_meta_engine_source.yml +0 -56
- data/spec/fixtures/vcr/app_search/delete_synonym_set.yml +0 -56
- data/spec/fixtures/vcr/app_search/get_api_key.yml +0 -52
- data/spec/fixtures/vcr/app_search/get_curation.yml +0 -56
- data/spec/fixtures/vcr/app_search/get_engine.yml +0 -55
- data/spec/fixtures/vcr/app_search/index_and_delete_document.yml +0 -107
- data/spec/fixtures/vcr/app_search/list_api_keys.yml +0 -52
- data/spec/fixtures/vcr/app_search/list_curations.yml +0 -56
- data/spec/fixtures/vcr/app_search/list_documents.yml +0 -57
- data/spec/fixtures/vcr/app_search/list_engines.yml +0 -55
- data/spec/fixtures/vcr/app_search/list_synonym_sets.yml +0 -56
- data/spec/fixtures/vcr/app_search/multi_query_search.yml +0 -63
- data/spec/fixtures/vcr/app_search/put_api_key.yml +0 -52
- data/spec/fixtures/vcr/app_search/put_curation.yml +0 -113
- data/spec/fixtures/vcr/app_search/put_synonym_set.yml +0 -56
- data/spec/fixtures/vcr/app_search/search.yml +0 -57
- data/spec/fixtures/vcr/app_search/single_query_search.yml +0 -60
- data/spec/fixtures/vcr/app_search/synonym_set.yml +0 -56
- data/spec/integration/workplace_search_spec.rb +0 -375
@@ -17,28 +17,34 @@
|
|
17
17
|
|
18
18
|
# frozen_string_literal: true
|
19
19
|
|
20
|
-
require_relative
|
20
|
+
require_relative "#{__dir__}/app_search_helper.rb"
|
21
21
|
|
22
22
|
describe Elastic::EnterpriseSearch::AppSearch::Client do
|
23
|
-
context '
|
23
|
+
context 'top clicks analytics' do
|
24
|
+
let(:engine_name) { 'top-clicks-analytics' }
|
25
|
+
|
26
|
+
before do
|
27
|
+
client.create_engine(name: engine_name)
|
28
|
+
end
|
29
|
+
|
30
|
+
after do
|
31
|
+
delete_engines
|
32
|
+
end
|
33
|
+
|
24
34
|
it 'returns api_top_clicks_analytics with no query' do
|
25
|
-
|
26
|
-
|
27
|
-
expect(response.status).to eq 200
|
35
|
+
response = client.top_clicks_analytics(engine_name)
|
36
|
+
expect(response.status).to eq 200
|
28
37
|
|
29
|
-
|
30
|
-
|
31
|
-
end
|
38
|
+
expect(response.body['results'])
|
39
|
+
expect(response.body['meta'])
|
32
40
|
end
|
33
41
|
|
34
42
|
it 'returns api_top_clicks_analytics with query' do
|
35
|
-
|
36
|
-
|
37
|
-
expect(response.status).to eq 200
|
43
|
+
response = client.top_clicks_analytics(engine_name, query: 'test')
|
44
|
+
expect(response.status).to eq 200
|
38
45
|
|
39
|
-
|
40
|
-
|
41
|
-
end
|
46
|
+
expect(response.body['results'])
|
47
|
+
expect(response.body['meta'])
|
42
48
|
end
|
43
49
|
end
|
44
50
|
end
|
@@ -17,18 +17,26 @@
|
|
17
17
|
|
18
18
|
# frozen_string_literal: true
|
19
19
|
|
20
|
-
require_relative
|
20
|
+
require_relative "#{__dir__}/app_search_helper.rb"
|
21
21
|
|
22
22
|
describe Elastic::EnterpriseSearch::AppSearch::Client do
|
23
|
-
|
23
|
+
let(:engine_name) { 'top-queries-analytics' }
|
24
|
+
|
25
|
+
before do
|
26
|
+
client.create_engine(name: engine_name)
|
27
|
+
end
|
28
|
+
|
29
|
+
after do
|
30
|
+
delete_engines
|
31
|
+
end
|
32
|
+
|
33
|
+
context 'top queries analytics' do
|
24
34
|
it 'returns api_top_queries_analytics with no query' do
|
25
|
-
|
26
|
-
|
27
|
-
expect(response.status).to eq 200
|
35
|
+
response = @client.top_queries_analytics(engine_name)
|
36
|
+
expect(response.status).to eq 200
|
28
37
|
|
29
|
-
|
30
|
-
|
31
|
-
end
|
38
|
+
expect(response.body['results'])
|
39
|
+
expect(response.body['meta'])
|
32
40
|
end
|
33
41
|
end
|
34
42
|
end
|
@@ -0,0 +1,106 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
require_relative "#{__dir__}/workplace_search_helper.rb"
|
21
|
+
|
22
|
+
describe Elastic::EnterpriseSearch::WorkplaceSearch::Client do
|
23
|
+
context 'Content Sources' do
|
24
|
+
after do
|
25
|
+
delete_content_sources
|
26
|
+
end
|
27
|
+
|
28
|
+
it 'creates, retrieves and deletes authenticated with basic auth' do
|
29
|
+
# Create a content source and get its id
|
30
|
+
response = client.create_content_source(name: 'test')
|
31
|
+
expect(response.status).to eq 200
|
32
|
+
expect(response.body['id'])
|
33
|
+
id = response.body['id']
|
34
|
+
|
35
|
+
# Test we get the content source information with get_content_source
|
36
|
+
response = client.content_source(id)
|
37
|
+
expect(response.status).to eq 200
|
38
|
+
|
39
|
+
# List all content sources
|
40
|
+
response = client.list_content_sources
|
41
|
+
expect(response.status).to eq 200
|
42
|
+
expect(response.body['results'].count).to be >= 1
|
43
|
+
|
44
|
+
# Delete content source
|
45
|
+
response = client.delete_content_source(id)
|
46
|
+
expect(response.status).to eq 200
|
47
|
+
end
|
48
|
+
|
49
|
+
it 'creates and updates' do
|
50
|
+
response = client.create_content_source(name: 'ruby_client_app')
|
51
|
+
expect(response.status).to eq 200
|
52
|
+
id = response.body['id']
|
53
|
+
|
54
|
+
documents = [{ title: 'My first Document', body: 'Content', url: 'elastic.co' }]
|
55
|
+
response = client.index_documents(id, documents: documents)
|
56
|
+
expect(response.status).to eq 200
|
57
|
+
|
58
|
+
new_name = 'ruby_client'
|
59
|
+
body = {
|
60
|
+
name: new_name,
|
61
|
+
schema: { title: 'text', body: 'text', url: 'text' },
|
62
|
+
display: { title_field: 'title', url_field: 'url', color: '#f00f00' },
|
63
|
+
is_searchable: true
|
64
|
+
}
|
65
|
+
response = client.put_content_source(id, body: body)
|
66
|
+
expect(response.status).to eq 200
|
67
|
+
|
68
|
+
response = client.content_source(id)
|
69
|
+
expect(response.status).to eq 200
|
70
|
+
expect(response.body['name']) == new_name
|
71
|
+
end
|
72
|
+
|
73
|
+
it 'syncs jobs' do
|
74
|
+
response = client.create_content_source(name: 'sync_jobs_test')
|
75
|
+
expect(response.status).to eq 200
|
76
|
+
id = response.body['id']
|
77
|
+
|
78
|
+
response = client.command_sync_jobs(id, body: { command: 'interrupt' })
|
79
|
+
expect(response.status).to eq 200
|
80
|
+
expect(response.body['results'].keys).to eq ['interrupted']
|
81
|
+
end
|
82
|
+
|
83
|
+
context 'icons' do
|
84
|
+
let(:content_source_id) { client.create_content_source(name: 'with-icon').body['id'] }
|
85
|
+
|
86
|
+
it 'puts an icon' do
|
87
|
+
path = File.expand_path("#{File.dirname(__FILE__)}/icon.png")
|
88
|
+
icon = Base64.strict_encode64(File.read(path))
|
89
|
+
response = client.put_content_source_icons(content_source_id, main_icon: icon, alt_icon: icon)
|
90
|
+
expect(response.status).to eq 200
|
91
|
+
expect(response.body['results']).to eq({ 'main_icon' => 'success', 'alt_icon' => 'success' })
|
92
|
+
end
|
93
|
+
end
|
94
|
+
|
95
|
+
context 'auto query refinements details' do
|
96
|
+
let(:content_source_id) { client.create_content_source(name: 'refinements').body['id'] }
|
97
|
+
|
98
|
+
it 'retrieves details' do
|
99
|
+
response = client.auto_query_refinement_details(content_source_id)
|
100
|
+
|
101
|
+
expect(response.status).to eq 200
|
102
|
+
expect(response.body.keys.sort).to eq ['defaults', 'overrides', 'results']
|
103
|
+
end
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
@@ -0,0 +1,95 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
require_relative "#{__dir__}/workplace_search_helper.rb"
|
21
|
+
|
22
|
+
describe Elastic::EnterpriseSearch::WorkplaceSearch::Client do
|
23
|
+
after do
|
24
|
+
delete_content_sources
|
25
|
+
end
|
26
|
+
|
27
|
+
let(:documents) do
|
28
|
+
[
|
29
|
+
{
|
30
|
+
'id' => '4e696e74656e646f203634',
|
31
|
+
'url' => 'https://www.elastic.co/blog/introducing-quick-start-guides-getting-started-with-elastic-enterprise-search-for-free',
|
32
|
+
'title' => 'Getting started with Elastic Enterprise Search for free',
|
33
|
+
'body' => 'this is a test'
|
34
|
+
},
|
35
|
+
{
|
36
|
+
'id' => '47616d6520426f7920436f6c6f72',
|
37
|
+
'url' => 'https://www.elastic.co/workplace-search',
|
38
|
+
'title' => 'One-stop answer shop for the virtual workplace',
|
39
|
+
'body' => 'this is also a test'
|
40
|
+
}
|
41
|
+
]
|
42
|
+
end
|
43
|
+
|
44
|
+
context 'Documents' do
|
45
|
+
let(:content_source_id) do
|
46
|
+
client.create_content_source(name: 'test').body['id']
|
47
|
+
end
|
48
|
+
|
49
|
+
it 'indexes' do
|
50
|
+
response = client.index_documents(content_source_id, documents: documents)
|
51
|
+
expect(response.status).to eq 200
|
52
|
+
end
|
53
|
+
|
54
|
+
it 'deletes' do
|
55
|
+
response = client.delete_documents(content_source_id, document_ids: documents.map { |doc| doc['id'] })
|
56
|
+
expect(response.status).to eq 200
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
context 'Documents in Content Sources' do
|
61
|
+
let(:content_source_id) { client.create_content_source(name: 'books').body['id'] }
|
62
|
+
let(:document_id) { client.index_documents(content_source_id, documents: documents).body['results'].first['id'] }
|
63
|
+
|
64
|
+
it 'Gets a document in a content source' do
|
65
|
+
response = client.document(content_source_id, document_id: document_id)
|
66
|
+
expect(response.status).to eq 200
|
67
|
+
expect(response.body['id']).to eq document_id
|
68
|
+
end
|
69
|
+
|
70
|
+
it 'Deletes all documents in a content source' do
|
71
|
+
response = client.delete_all_documents(content_source_id)
|
72
|
+
expect(response.status).to eq 200
|
73
|
+
end
|
74
|
+
|
75
|
+
it 'Deletes documents by query' do
|
76
|
+
content_source_id = client.create_content_source(name: 'asimov').body['id']
|
77
|
+
documents = [
|
78
|
+
{ title: 'Foundation', year: 1951 },
|
79
|
+
{ title: 'Foundation and Empire', year: 1952 },
|
80
|
+
{ title: 'Second Foundation', year: 1953 }
|
81
|
+
]
|
82
|
+
response = client.index_documents(content_source_id, documents: documents)
|
83
|
+
|
84
|
+
expect(response.status).to eq 200
|
85
|
+
expect(response.body['results'].count).to eq 3
|
86
|
+
|
87
|
+
# Give time to index the documents so we can delete them:
|
88
|
+
sleep 2
|
89
|
+
|
90
|
+
response = client.delete_documents_by_query(content_source_id, query: 'Foundation')
|
91
|
+
expect(response.status).to eq 200
|
92
|
+
expect(response.body).to eq({ 'total' => 3, 'deleted' => 3, 'failures' => [] })
|
93
|
+
end
|
94
|
+
end
|
95
|
+
end
|
@@ -0,0 +1,97 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
require_relative "#{__dir__}/workplace_search_helper.rb"
|
21
|
+
|
22
|
+
describe Elastic::EnterpriseSearch::WorkplaceSearch::Client do
|
23
|
+
context 'External Identities' do
|
24
|
+
after do
|
25
|
+
delete_content_sources
|
26
|
+
end
|
27
|
+
|
28
|
+
let(:content_source_id) { client.create_content_source(name: 'my_content').body['id'] }
|
29
|
+
let(:user) { 'elastic_user' }
|
30
|
+
let(:source_user_id) { 'example@elastic.co' }
|
31
|
+
let(:body) do
|
32
|
+
{ user: user, source_user_id: source_user_id }
|
33
|
+
end
|
34
|
+
|
35
|
+
context 'Creates' do
|
36
|
+
let(:source_user_id) { 'test@elastic.co' }
|
37
|
+
let(:user) { 'test' }
|
38
|
+
|
39
|
+
it 'creates an external identity' do
|
40
|
+
response = client.create_external_identity(content_source_id, body: body)
|
41
|
+
|
42
|
+
expect(response.status).to eq 200
|
43
|
+
expect(response.body).to eq({ 'source_user_id' => source_user_id, 'user' => user })
|
44
|
+
|
45
|
+
client.delete_external_identity(content_source_id, user: user)
|
46
|
+
end
|
47
|
+
|
48
|
+
it 'creates and retrieves' do
|
49
|
+
client.create_external_identity(content_source_id, body: body)
|
50
|
+
response = client.external_identity(content_source_id, user: user)
|
51
|
+
|
52
|
+
expect(response.status).to eq 200
|
53
|
+
expect(response.body).to eq({ 'source_user_id' => source_user_id, 'user' => user })
|
54
|
+
client.delete_external_identity(content_source_id, user: user)
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
58
|
+
context 'Lists' do
|
59
|
+
let(:user) { 'lists_test' }
|
60
|
+
|
61
|
+
it 'lists external identities' do
|
62
|
+
client.create_external_identity(content_source_id, body: body)
|
63
|
+
response = client.list_external_identities(content_source_id)
|
64
|
+
|
65
|
+
expect(response.status).to eq 200
|
66
|
+
expect(response.body['results']).to eq([{ 'source_user_id' => source_user_id, 'user' => user }])
|
67
|
+
client.delete_external_identity(content_source_id, user: user)
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
context 'Updates' do
|
72
|
+
before do
|
73
|
+
client.create_external_identity(content_source_id, body: body)
|
74
|
+
end
|
75
|
+
|
76
|
+
it 'updates an external identity' do
|
77
|
+
body = { source_user_id: 'example2@elastic.co' }
|
78
|
+
response = client.put_external_identity(content_source_id, user: user, body: body)
|
79
|
+
|
80
|
+
expect(response.status).to eq 200
|
81
|
+
expect(response.body).to eq({ 'source_user_id' => 'example2@elastic.co', 'user' => user })
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
85
|
+
context 'Deletes' do
|
86
|
+
before do
|
87
|
+
client.create_external_identity(content_source_id, body: body)
|
88
|
+
end
|
89
|
+
|
90
|
+
it 'deletes an external identity' do
|
91
|
+
response = client.delete_external_identity(content_source_id, user: user)
|
92
|
+
expect(response.status).to eq 200
|
93
|
+
expect(response.body).to eq 'ok'
|
94
|
+
end
|
95
|
+
end
|
96
|
+
end
|
97
|
+
end
|
File without changes
|
@@ -0,0 +1,77 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
require_relative "#{__dir__}/workplace_search_helper.rb"
|
21
|
+
|
22
|
+
describe Elastic::EnterpriseSearch::WorkplaceSearch::Client do
|
23
|
+
context 'Permissions' do
|
24
|
+
let(:content_source_id) { client.create_content_source(name: 'my_content').body['id'] }
|
25
|
+
let(:user) { 'enterprise_search' }
|
26
|
+
let(:permissions) { ['permission1', 'permission2'] }
|
27
|
+
|
28
|
+
after do
|
29
|
+
client.put_user_permissions(content_source_id, { permissions: [], user: user })
|
30
|
+
delete_content_sources
|
31
|
+
end
|
32
|
+
|
33
|
+
it 'adds permissions to a user' do
|
34
|
+
response = client.add_user_permissions(
|
35
|
+
content_source_id,
|
36
|
+
{ permissions: permissions, user: user }
|
37
|
+
)
|
38
|
+
expect(response.status).to eq 200
|
39
|
+
expect(response.body).to eq({ 'user' => 'enterprise_search', 'permissions' => ['permission1', 'permission2'] })
|
40
|
+
end
|
41
|
+
|
42
|
+
it 'removes permissions from a user' do
|
43
|
+
client.add_user_permissions(content_source_id, { permissions: permissions, user: user })
|
44
|
+
|
45
|
+
# Removes Permissions
|
46
|
+
response = client.remove_user_permissions(
|
47
|
+
content_source_id,
|
48
|
+
{ permissions: permissions, user: user }
|
49
|
+
)
|
50
|
+
expect(response.status).to eq 200
|
51
|
+
expect(response.body).to eq({ 'user' => 'enterprise_search', 'permissions' => [] })
|
52
|
+
end
|
53
|
+
|
54
|
+
it 'lists permissions' do
|
55
|
+
response = client.list_permissions(content_source_id)
|
56
|
+
expect(response.status).to eq 200
|
57
|
+
end
|
58
|
+
|
59
|
+
it 'gets a user\'s permissions' do
|
60
|
+
client.add_user_permissions(content_source_id, { permissions: permissions, user: user })
|
61
|
+
response = client.user_permissions(content_source_id, { user: user })
|
62
|
+
expect(response.status).to eq 200
|
63
|
+
expect(response.body).to eq({ 'user' => 'enterprise_search', 'permissions' => permissions })
|
64
|
+
end
|
65
|
+
|
66
|
+
it 'updates a user\'s permissions' do
|
67
|
+
permissions = ['testing', 'more', 'permissions']
|
68
|
+
response = client.add_user_permissions(content_source_id, { permissions: permissions, user: user })
|
69
|
+
expect(response.status).to eq 200
|
70
|
+
expect(response.body).to eq({ 'user' => 'enterprise_search', 'permissions' => permissions })
|
71
|
+
|
72
|
+
response = client.put_user_permissions(content_source_id, { permissions: [], user: user })
|
73
|
+
expect(response.status).to eq 200
|
74
|
+
expect(response.body).to eq({ 'user' => 'enterprise_search', 'permissions' => [] })
|
75
|
+
end
|
76
|
+
end
|
77
|
+
end
|
@@ -0,0 +1,92 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
require_relative "#{__dir__}/workplace_search_helper.rb"
|
21
|
+
|
22
|
+
describe Elastic::EnterpriseSearch::WorkplaceSearch::Client do
|
23
|
+
context 'Synonym sets' do
|
24
|
+
after do
|
25
|
+
delete_content_sources
|
26
|
+
end
|
27
|
+
|
28
|
+
let(:body) do
|
29
|
+
{
|
30
|
+
synonym_sets: [
|
31
|
+
{ 'synonyms' => ['house', 'home', 'abode'] },
|
32
|
+
{ 'synonyms' => ['cat', 'feline', 'kitty'] },
|
33
|
+
{ 'synonyms' => ['mouses', 'mice'] }
|
34
|
+
]
|
35
|
+
}
|
36
|
+
end
|
37
|
+
|
38
|
+
it 'creates and deletes a batch synonym set' do
|
39
|
+
response = client.create_batch_synonym_sets(body: body)
|
40
|
+
|
41
|
+
expect(response.status).to eq 200
|
42
|
+
expect(response.body['has_errors']).to eq false
|
43
|
+
expect(response.body['synonym_sets'].count).to eq 3
|
44
|
+
|
45
|
+
response.body['synonym_sets'].map { |s| client.delete_synonym_set(synonym_set_id: s['id']) }
|
46
|
+
end
|
47
|
+
|
48
|
+
it 'lists synonym sets' do
|
49
|
+
client.create_batch_synonym_sets(body: body)
|
50
|
+
response = client.list_synonym_sets
|
51
|
+
|
52
|
+
expect(response.status).to eq 200
|
53
|
+
expect(response.body['results'].count).to eq 3
|
54
|
+
|
55
|
+
response.body['results'].map { |syn| client.delete_synonym_set(synonym_set_id: syn['id']) }
|
56
|
+
end
|
57
|
+
|
58
|
+
it 'gets a single synonym set' do
|
59
|
+
id = client.create_batch_synonym_sets(
|
60
|
+
body: {
|
61
|
+
synonym_sets: [
|
62
|
+
{ 'synonyms' => ['house', 'home', 'abode'] }
|
63
|
+
]
|
64
|
+
}
|
65
|
+
).body['synonym_sets'].first['id']
|
66
|
+
|
67
|
+
response = client.synonym_set(synonym_set_id: id)
|
68
|
+
expect(response.status).to eq 200
|
69
|
+
expect(response.body['id']).to eq id
|
70
|
+
expect(response.body['synonyms']).to eq ['house', 'home', 'abode']
|
71
|
+
client.delete_synonym_set(synonym_set_id: id)
|
72
|
+
end
|
73
|
+
|
74
|
+
it 'updates a synonym set' do
|
75
|
+
response = client.create_batch_synonym_sets(
|
76
|
+
body: {
|
77
|
+
synonym_sets: [
|
78
|
+
{ 'synonyms' => ['mouses', 'mice'] }
|
79
|
+
]
|
80
|
+
}
|
81
|
+
)
|
82
|
+
id = response.body['synonym_sets'].first['id']
|
83
|
+
body = { synonyms: ['mouses', 'mice', 'luch'] }
|
84
|
+
|
85
|
+
response = client.put_synonym_set(synonym_set_id: id, body: body)
|
86
|
+
|
87
|
+
expect(response.status).to eq 200
|
88
|
+
expect(response.body).to eq({ 'id' => id, 'synonyms' => ['mouses', 'mice', 'luch'] })
|
89
|
+
client.delete_synonym_set(synonym_set_id: id)
|
90
|
+
end
|
91
|
+
end
|
92
|
+
end
|
@@ -0,0 +1,43 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
require_relative "#{__dir__}/workplace_search_helper.rb"
|
21
|
+
|
22
|
+
describe Elastic::EnterpriseSearch::WorkplaceSearch::Client do
|
23
|
+
context 'Triggers' do
|
24
|
+
it 'gets and updates triggers blocklist' do
|
25
|
+
response = client.triggers_blocklist
|
26
|
+
expect(response.status).to eq 200
|
27
|
+
expect(response.body['blocklist']).not_to be_empty
|
28
|
+
original_list = response.body['blocklist']
|
29
|
+
|
30
|
+
# Add a term to the block list and check it's been changed
|
31
|
+
response = client.put_triggers_blocklist(body: { blocklist: original_list + ['tests'] })
|
32
|
+
expect(response.status).to eq 200
|
33
|
+
expect(response.body['blocklist']).to eq(original_list + ['tests'])
|
34
|
+
response = client.triggers_blocklist
|
35
|
+
expect(response.body['blocklist']).to eq(original_list + ['tests'])
|
36
|
+
|
37
|
+
# Restored original list
|
38
|
+
response = client.put_triggers_blocklist(body: { blocklist: original_list })
|
39
|
+
expect(response.status).to eq 200
|
40
|
+
expect(response.body['blocklist']).to eq(original_list)
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
data/spec/{app-search/api_query_suggestion_spec.rb → integration/workplace-search/users_spec.rb}
RENAMED
@@ -17,23 +17,20 @@
|
|
17
17
|
|
18
18
|
# frozen_string_literal: true
|
19
19
|
|
20
|
-
require_relative
|
20
|
+
require_relative "#{__dir__}/workplace_search_helper.rb"
|
21
21
|
|
22
|
-
describe Elastic::EnterpriseSearch::
|
23
|
-
context '
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
expect(response.status).to eq 200
|
22
|
+
describe Elastic::EnterpriseSearch::WorkplaceSearch::Client do
|
23
|
+
context 'Users' do
|
24
|
+
it 'gets the current user' do
|
25
|
+
response = client.current_user
|
26
|
+
expect(response.status).to eq 200
|
27
|
+
expect(response.body.keys).to eq ['email', 'username']
|
28
|
+
end
|
31
29
|
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
end
|
30
|
+
it 'gets the current user with an access token' do
|
31
|
+
response = client.current_user(get_token: true)
|
32
|
+
expect(response.status).to eq 200
|
33
|
+
expect(response.body.keys).to eq ['email', 'username', 'access_token']
|
37
34
|
end
|
38
35
|
end
|
39
36
|
end
|
@@ -0,0 +1,39 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
require 'spec_helper'
|
21
|
+
|
22
|
+
# Workplace Search Integration tests Client Configuration
|
23
|
+
def client
|
24
|
+
@client ||= Elastic::EnterpriseSearch::WorkplaceSearch::Client.new(
|
25
|
+
host: ENV['ELASTIC_ENTERPRISE_HOST'] || 'http://localhost:3002',
|
26
|
+
http_auth: {
|
27
|
+
user: ENV['ELASTIC_ENTERPRISE_USER'] || 'enterprise_search',
|
28
|
+
password: ENV['ELASTIC_ENTERPRISE_PASSWORD'] || 'changeme'
|
29
|
+
}
|
30
|
+
)
|
31
|
+
end
|
32
|
+
|
33
|
+
def delete_content_sources
|
34
|
+
sources = client.list_content_sources.body['results']
|
35
|
+
sources.each do |source|
|
36
|
+
client.delete_content_source(source['id'])
|
37
|
+
end
|
38
|
+
sleep 1
|
39
|
+
end
|