github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.6] [Enterprise Search] Fix painless script bug cancelling syncs (#150250) (#150256)

Browse source 
# Backport

This will backport the following commits from `main` to `8.6`:
- [[Enterprise Search] Fix painless script bug cancelling syncs
(#150250)](https://github.com/elastic/kibana/pull/150250)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Sander
Philipse","email":"94373878+sphilipse@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-02-03T18:17:19Z","message":"[Enterprise
Search] Fix painless script bug cancelling syncs (#150250)\n\n##
Summary\r\n\r\nFixes a formatting bug causing a painless script to
cancel syncs
to\r\nbreak.","sha":"c30c7870320ebd120ecd1f5da0253b215bbc40f3","branchLabelMapping":{"^v8.7.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:EnterpriseSearch","v8.7.0","v8.6.2"],"number":150250,"url":"https://github.com/elastic/kibana/pull/150250","mergeCommit":{"message":"[Enterprise
Search] Fix painless script bug cancelling syncs (#150250)\n\n##
Summary\r\n\r\nFixes a formatting bug causing a painless script to
cancel syncs
to\r\nbreak.","sha":"c30c7870320ebd120ecd1f5da0253b215bbc40f3"}},"sourceBranch":"main","suggestedTargetBranches":["8.6"],"targetPullRequestStates":[{"branch":"main","label":"v8.7.0","labelRegex":"^v8.7.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/150250","number":150250,"mergeCommit":{"message":"[Enterprise
Search] Fix painless script bug cancelling syncs (#150250)\n\n##
Summary\r\n\r\nFixes a formatting bug causing a painless script to
cancel syncs
to\r\nbreak.","sha":"c30c7870320ebd120ecd1f5da0253b215bbc40f3"}},{"branch":"8.6","label":"v8.6.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Sander Philipse <94373878+sphilipse@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2023-02-03 14:27:19 -05:00 • committed by GitHub
parent 4f426de5e6
commit cb7d76d976
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
x-pack/plugins/enterprise_search/server/lib/connectors/post_cancel_syncs.test.ts
View file

@ -55,12 +55,10 @@ describe('addConnector lib function', () => {
refresh: true,
script: {
lang: 'painless',
source: `
ctx._source['status'] = '${SyncStatus.CANCELED}';
ctx._source['cancelation_requested_at'] = '${new Date(Date.now()).toISOString()}';
ctx._source['canceled_at'] = '${new Date(Date.now()).toISOString()}';
ctx._source['completed_at'] = '${new Date(Date.now()).toISOString()}';
`,
source: `ctx._source['status'] = '${SyncStatus.CANCELED}';
ctx._source['cancelation_requested_at'] = '${new Date(Date.now()).toISOString()}';
ctx._source['canceled_at'] = '${new Date(Date.now()).toISOString()}';
ctx._source['completed_at'] = '${new Date(Date.now()).toISOString()}';`,
},
});
expect(mockClient.asCurrentUser.updateByQuery).toHaveBeenCalledWith({
@ -84,10 +82,8 @@ describe('addConnector lib function', () => {
refresh: true,
script: {
lang: 'painless',
source: `
ctx._source['status'] = '${SyncStatus.CANCELING}'
ctx._source['cancelation_requested_at'] = '${new Date(Date.now()).toISOString()}';
`,
source: `ctx._source['status'] = '${SyncStatus.CANCELING}';
ctx._source['cancelation_requested_at'] = '${new Date(Date.now()).toISOString()}';`,
},
});
await expect(mockClient.asCurrentUser.update).toHaveBeenCalledWith({

16
x-pack/plugins/enterprise_search/server/lib/connectors/post_cancel_syncs.ts
View file

@ -35,12 +35,10 @@ export const cancelSyncs = async (
refresh: true,
script: {
lang: 'painless',
source: `
ctx._source['status'] = '${SyncStatus.CANCELED}';
ctx._source['cancelation_requested_at'] = '${new Date(Date.now()).toISOString()}';
ctx._source['canceled_at'] = '${new Date(Date.now()).toISOString()}';
ctx._source['completed_at'] = '${new Date(Date.now()).toISOString()}';
`,
source: `ctx._source['status'] = '${SyncStatus.CANCELED}';
ctx._source['cancelation_requested_at'] = '${new Date(Date.now()).toISOString()}';
ctx._source['canceled_at'] = '${new Date(Date.now()).toISOString()}';
ctx._source['completed_at'] = '${new Date(Date.now()).toISOString()}';`,
},
});
await client.asCurrentUser.updateByQuery({
@ -64,10 +62,8 @@ export const cancelSyncs = async (
refresh: true,
script: {
lang: 'painless',
source: `
ctx._source['status'] = '${SyncStatus.CANCELING}'
ctx._source['cancelation_requested_at'] = '${new Date(Date.now()).toISOString()}';
`,
source: `ctx._source['status'] = '${SyncStatus.CANCELING}';
ctx._source['cancelation_requested_at'] = '${new Date(Date.now()).toISOString()}';`,
},
});
await client.asCurrentUser.update({