forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge 'main' into lucene_snapshot_9_9
- Loading branch information
Showing
35 changed files
with
1,750 additions
and
110 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_error.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "connector.update_error": { | ||
| "documentation": { | ||
| "url": "https://www.elastic.co/guide/en/enterprise-search/current/connectors.html", | ||
| "description": "Updates the error field in the connector document." | ||
| }, | ||
| "stability": "experimental", | ||
| "visibility": "feature_flag", | ||
| "feature_flag": "es.connector_api_feature_flag_enabled", | ||
| "headers": { | ||
| "accept": [ | ||
| "application/json" | ||
| ], | ||
| "content_type": [ | ||
| "application/json" | ||
| ] | ||
| }, | ||
| "url": { | ||
| "paths": [ | ||
| { | ||
| "path": "/_connector/{connector_id}/_error", | ||
| "methods": [ | ||
| "PUT" | ||
| ], | ||
| "parts": { | ||
| "connector_id": { | ||
| "type": "string", | ||
| "description": "The unique identifier of the connector to be updated." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "body": { | ||
| "description": "An object containing the connector's error.", | ||
| "required": true | ||
| } | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
rest-api-spec/src/main/resources/rest-api-spec/api/connector_sync_job.get.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "connector_sync_job.get": { | ||
| "documentation": { | ||
| "url": "https://www.elastic.co/guide/en/enterprise-search/current/connectors.html", | ||
| "description": "Returns the details about a connector sync job." | ||
| }, | ||
| "stability": "experimental", | ||
| "visibility": "feature_flag", | ||
| "feature_flag": "es.connector_api_feature_flag_enabled", | ||
| "headers": { | ||
| "accept": [ | ||
| "application/json" | ||
| ] | ||
| }, | ||
| "url": { | ||
| "paths": [ | ||
| { | ||
| "path": "/_connector/_sync_job/{connector_sync_job_id}", | ||
| "methods": [ | ||
| "GET" | ||
| ], | ||
| "parts": { | ||
| "connector_sync_job_id": { | ||
| "type": "string", | ||
| "description": "The unique identifier of the connector sync job to be returned." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...st/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| setup: | ||
| - skip: | ||
| version: " - 8.11.99" | ||
| reason: Introduced in 8.12.0 | ||
|
|
||
| - do: | ||
| connector.put: | ||
| connector_id: test-connector | ||
| body: | ||
| index_name: search-1-test | ||
| name: my-connector | ||
| language: pl | ||
| is_native: false | ||
| service_type: super-connector | ||
|
|
||
| --- | ||
| "Update Connector Error": | ||
| - do: | ||
| connector.update_error: | ||
| connector_id: test-connector | ||
| body: | ||
| error: "some error" | ||
|
|
||
|
|
||
| - match: { result: updated } | ||
|
|
||
| - do: | ||
| connector.get: | ||
| connector_id: test-connector | ||
|
|
||
| - match: { error: "some error" } | ||
|
|
||
| --- | ||
| "Update Connector Error - 404 when connector doesn't exist": | ||
| - do: | ||
| catch: "missing" | ||
| connector.update_error: | ||
| connector_id: test-non-existent-connector | ||
| body: | ||
| error: "some error" | ||
|
|
||
| --- | ||
| "Update Connector Error - 400 status code when connector_id is empty": | ||
| - do: | ||
| catch: "bad_request" | ||
| connector.update_error: | ||
| connector_id: "" | ||
| body: | ||
| error: "some error" | ||
|
|
||
| --- | ||
| "Update Connector Error - 400 status code when payload is not string": | ||
| - do: | ||
| catch: "bad_request" | ||
| connector.update_error: | ||
| connector_id: test-connector | ||
| body: | ||
| error: | ||
| field_1: test | ||
| field_2: something |
36 changes: 36 additions & 0 deletions
36
...st/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| setup: | ||
| - skip: | ||
| version: " - 8.11.99" | ||
| reason: Introduced in 8.12.0 | ||
| - do: | ||
| connector.put: | ||
| connector_id: test-connector | ||
| body: | ||
| index_name: search-test | ||
| name: my-connector | ||
| language: de | ||
| is_native: false | ||
| service_type: super-connector | ||
|
|
||
| --- | ||
| 'Get connector sync job': | ||
| - do: | ||
| connector_sync_job.post: | ||
| body: | ||
| id: test-connector | ||
| job_type: access_control | ||
| trigger_method: scheduled | ||
| - set: { id: id } | ||
| - match: { id: $id } | ||
| - do: | ||
| connector_sync_job.get: | ||
| connector_sync_job_id: $id | ||
| - match: { job_type: access_control } | ||
| - match: { trigger_method: scheduled } | ||
|
|
||
| --- | ||
| 'Get connector sync job - Missing sync job id': | ||
| - do: | ||
| connector_sync_job.get: | ||
| connector_sync_job_id: non-existing-sync-job-id | ||
| catch: missing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.