[Elasticsearch] remove legacy es client #107619

mshustov · 2021-08-04T08:27:29Z

Summary

Remove the legacy ES client from Core API and the legacy elasticsearch client from Kibana dependencies.
It's been deprecated for a long time and we stated that it will be removed by v7.16.0

kibana/src/core/server/elasticsearch/types.ts

Line 76 in ca137ea

* @removeBy 7.16

Plugin API changes

The legacy Elasticsearch client is no longer available in CoreSetup and RequestHandlerContext interfaces. Use the new client instead https://www.elastic.co/guide/en/kibana/current/elasticsearch-service.html

mshustov · 2021-08-04T10:31:36Z

@mistic The integration test failures likely are caused by my changes, but it's hard to debug them due to cryptic error stack:

11:40:03   FAIL  packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
11:40:03    ● Test suite failed to run
11:40:03  
11:40:03      /dev/shm/workspace/parallel/3/kibana/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts: Error: No substitution given for "$0". If this is not meant to be a
11:40:03                  placeholder you may want to consider passing one of the following options to @babel/template:
11:40:03                  - { placeholderPattern: false, placeholderWhitelist: new Set(['$0'])}
11:40:03                  - { placeholderPattern: /^$0$/ }
11:40:03  
11:40:03                    placeholder you may want to consider passing one of the following options to @babel/template:
11:40:03                    - { placeholderPattern: false, placeholderWhitelist: new Set(['$0'])}
11:40:03                    - { placeholderPattern: /^$0$/ }
11:40:03            at undefined
11:40:03            at undefined
11:40:03            at undefined
11:40:03            at undefined
11:40:03            at undefined
11:40:03            at undefined
11:40:03            at undefined
11:40:03            at undefined
11:40:03            at undefined
11:40:03            at undefined

Would you mind taking a look, please?

joshdover · 2021-08-04T13:07:45Z

Should we merge it after v7.15 FF?

Sounds like a good plan to me.

mistic · 2021-08-13T14:25:00Z

@elasticmachine merge upstream

mistic

We can remove this now as the fix on Bazel was introduced

WORKSPACE.bazel

Co-authored-by: Tiago Costa <tiagoffcc@hotmail.com>

…ient' into issue-83910-remove-legacy-es-client

mshustov · 2021-08-18T07:38:40Z

src/core/server/elasticsearch/client/mocks.ts

 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { ElasticsearchClient } from './types';
 import { ICustomClusterClient } from './cluster_client';
 import { PRODUCT_RESPONSE_HEADER } from '../supported_server_response_check';

+// use jest.requireActual() to prevent weird errors when people mock @elastic/elasticsearch
+const { Client: UnmockedClient } = jest.requireActual('@elastic/elasticsearch');


This fix is done by @spalger. It seems to be a bug in mockify breaking runtime code, when it tries to mock an already mocked object. Related issue #108388

mshustov · 2021-08-18T07:40:01Z

x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts

@@ -53,7 +52,7 @@ describe('geo_containment', () => {
    it('should correctly transform expected results', async () => {
      const transformedResults = transformResults(
        // @ts-ignore
-        (sampleAggsJsonResponse.body as unknown) as SearchResponse<unknown>,
+        sampleAggsJsonResponse.body,


the line has // @ts-ignore directive, so the manual casting is unnecessary. and it's wrong anyway.

elasticmachine · 2021-08-18T07:43:03Z

Pinging @elastic/kibana-core (Team:Core)

mshustov · 2021-08-18T09:21:35Z

@elastic/kibana-app-services this file contains references to elasticsearch packages but it hasn't been updated for 10 months. I guess you need to remove it completely https://github.com/elastic/kibana/blob/6684d9531d7aad63a04faac81507f1d3b1c70820/src/plugins/data/server/plugins_data_server.api.md

pgayvallet

🥇

rudolf

🙌

ymao1

Alerting changes LGTM!

nreese

geo_containment changes LGMT

Dosant

src/plugins/data/server/server.api.mdCO review, LGTM

…legacy-es-client

kibanamachine · 2021-08-18T17:17:54Z

💚 Build Succeeded

Metrics [docs]

Unknown metric groups

API count

id	before	after	diff
`core`	2444	2260	-184

API count missing comments

id	before	after	diff
`core`	1166	1006	-160

API count with any type

id	before	after	diff
`core`	149	27	-122

References to deprecated APIs

id	before	after	diff
`globalSearch`	4	0	-4

History

💚 Build #146495 succeeded 6684d95
💚 Build #146352 succeeded 8983f3e
💚 Build #146339 succeeded eeb3807
💔 Build #146073 failed afc4c68
💔 Build #146033 failed 3696c3b

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@ts-ignore

* remove legacy es client * update docs * uninstall elasticsearch package * fix global_search tests * ad-hoc fix to address bazel failure. authored by Tiago * update docs * remove elasticsearch import. errors are muted with @ts-ignore * Update WORKSPACE.bazel Co-authored-by: Tiago Costa <tiagoffcc@hotmail.com> * update docs * fix problem when dev mock already mocked client Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Tiago Costa <tiagoffcc@hotmail.com> # Conflicts: # src/core/server/elasticsearch/legacy/scoped_cluster_client.test.ts

@ts-ignore

* remove legacy es client * update docs * uninstall elasticsearch package * fix global_search tests * ad-hoc fix to address bazel failure. authored by Tiago * update docs * remove elasticsearch import. errors are muted with @ts-ignore * Update WORKSPACE.bazel Co-authored-by: Tiago Costa <tiagoffcc@hotmail.com> * update docs * fix problem when dev mock already mocked client Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Tiago Costa <tiagoffcc@hotmail.com> # Conflicts: # src/core/server/elasticsearch/legacy/scoped_cluster_client.test.ts

stacey-gammon · 2021-08-24T14:26:25Z

-122 any types! 🎉 🎉 🎉

mshustov added 2 commits August 4, 2021 11:13

remove legacy es client

05e1caa

update docs

a8f4ec8

mshustov added 6 commits August 11, 2021 23:26

Merge branch 'master' into issue-83910-remove-legacy-es-client

b4ae4fe

uninstall elasticsearch package

f64f60e

fix global_search tests

2299e95

ad-hoc fix to address bazel failure. authored by Tiago

be9edad

update docs

3a52d59

remove elasticsearch import. errors are muted with @ts-ignore

8f00ca8

mshustov mentioned this pull request Aug 12, 2021

Jest Integration test failures produce a cryptic error stack trace #108388

Closed

Merge branch 'master' into issue-83910-remove-legacy-es-client

3968eb1

mistic reviewed Aug 13, 2021

View reviewed changes

WORKSPACE.bazel Outdated Show resolved Hide resolved

mshustov and others added 7 commits August 13, 2021 17:34

Update WORKSPACE.bazel

a94ab83

Co-authored-by: Tiago Costa <tiagoffcc@hotmail.com>

Merge branch 'master' into issue-83910-remove-legacy-es-client

621e559

Merge remote-tracking branch 'restrry/issue-83910-remove-legacy-es-cl…

3696c3b

…ient' into issue-83910-remove-legacy-es-client

update docs

afc4c68

fix problem when dev mock already mocked client

eeb3807

Merge branch 'master' into issue-83910-remove-legacy-es-client

8983f3e

Merge branch 'master' into issue-83910-remove-legacy-es-client

6684d95

mshustov commented Aug 18, 2021

View reviewed changes

mshustov marked this pull request as ready for review August 18, 2021 07:43

mshustov requested a review from a team as a code owner August 18, 2021 07:43

mshustov requested review from a team as code owners August 18, 2021 07:43

pgayvallet approved these changes Aug 18, 2021

View reviewed changes

rudolf approved these changes Aug 18, 2021

View reviewed changes

ymao1 approved these changes Aug 18, 2021

View reviewed changes

nreese approved these changes Aug 18, 2021

View reviewed changes

Dosant approved these changes Aug 18, 2021

View reviewed changes

Merge remote-tracking branch 'origin/master' into issue-83910-remove-…

bcd84aa

…legacy-es-client

mshustov merged commit b53b2cd into elastic:master Aug 18, 2021

mshustov deleted the issue-83910-remove-legacy-es-client branch August 18, 2021 17:18

mshustov mentioned this pull request Aug 18, 2021

[7.x] [Elasticsearch] remove legacy es client (#107619) #109144

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Elasticsearch] remove legacy es client #107619

[Elasticsearch] remove legacy es client #107619

mshustov commented Aug 4, 2021 •

edited

Loading

mshustov commented Aug 4, 2021

joshdover commented Aug 4, 2021

mistic commented Aug 13, 2021

mistic left a comment

mshustov Aug 18, 2021

mshustov Aug 18, 2021

elasticmachine commented Aug 18, 2021

mshustov commented Aug 18, 2021

pgayvallet left a comment

rudolf left a comment

ymao1 left a comment

nreese left a comment

Dosant left a comment

kibanamachine commented Aug 18, 2021

API count

API count missing comments

API count with any type

References to deprecated APIs

stacey-gammon commented Aug 24, 2021

[Elasticsearch] remove legacy es client #107619

[Elasticsearch] remove legacy es client #107619

Conversation

mshustov commented Aug 4, 2021 • edited Loading

Summary

Plugin API changes

mshustov commented Aug 4, 2021

joshdover commented Aug 4, 2021

mistic commented Aug 13, 2021

mistic left a comment

Choose a reason for hiding this comment

mshustov Aug 18, 2021

Choose a reason for hiding this comment

mshustov Aug 18, 2021

Choose a reason for hiding this comment

elasticmachine commented Aug 18, 2021

mshustov commented Aug 18, 2021

pgayvallet left a comment

Choose a reason for hiding this comment

rudolf left a comment

Choose a reason for hiding this comment

ymao1 left a comment

Choose a reason for hiding this comment

nreese left a comment

Choose a reason for hiding this comment

Dosant left a comment

Choose a reason for hiding this comment

kibanamachine commented Aug 18, 2021

💚 Build Succeeded

Metrics [docs]

API count

API count missing comments

API count with any type

References to deprecated APIs

History

stacey-gammon commented Aug 24, 2021

mshustov commented Aug 4, 2021 •

edited

Loading