[Security Solution, Lists] Replace legacy imports from 'elasticsearch' package by rylnd · Pull Request #107226 · elastic/kibana

rylnd · 2021-07-29T18:55:55Z

Summary

This prefers the newer types from '@elastic/elasticsearch'. Relates to #83910.

There was one instance where mock data was insufficient to satisfy the newer analogous types; in all other cases this was just a find/replace.

For maintainers

This was checked for breaking API changes and was labeled appropriately

This prefers the newer types from '@elastic/elasticsearch'. There was one instance where mock data was insufficient to satisfy the newer analogous types; in all other cases this was just a find/replace.

elasticmachine · 2021-07-29T18:58:45Z

Pinging @elastic/security-solution (Team: SecuritySolution)

@ts-expect-error

We know that this mock has hits with _source values, but we cannot convey this to typescript as null assertions are disabled within this project. This seems like the next best solution, preferable to a @ts-expect-error.

FrankHassanabad

LGTM,

What I did:

I looked at the types and the commit with the if check for _source and am fine with it.

mshustov · 2021-07-30T04:59:29Z

I can see a few imports left in x-pack/test/detection_engine_api_integration/* tests. Would you mind migrating them as well?

* refactors destructuring due to _source being properly declared as conditional

Changes here fall into one of two categories: * If the test was making an assertion on a value from _source, we simply null chain and continue to assert on a possibly undefined value. * If the test logic depends on _source being present, we first assert that presence, and exit the test early if absent.

rylnd · 2021-08-02T23:52:06Z

@FrankHassanabad @mshustov the changes required to fix the integration tests were much more comprehensive than our app code itself; see 93aa2db for details

rylnd · 2021-08-03T17:12:01Z

@elasticmachine merge upstream

Conflicts: x-pack/plugins/security_solution/public/cases/components/case_view/index.tsx

pzl

Security/OLM 👍

rylnd · 2021-08-05T17:12:20Z

@elasticmachine merge upstream

michaelolo24 · 2021-08-05T17:40:14Z

x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx


 import { useEffect, useRef, useState, useCallback } from 'react';
-import { UpdateDocumentByQueryResponse } from 'elasticsearch';
+import type { estypes } from '@elastic/elasticsearch';


michaelolo24 · 2021-08-05T17:42:27Z

x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx

    setEventsDeleted({ eventIds: alertIds, isDeleted: true });

-    if (response.version_conflicts > 0 && alertIds.length === 1) {
+    if (response.version_conflicts && alertIds.length === 1) {


won't this not run if response.version_conflicts === 0 since thats a falsy value?

Correct, a value of 0 never satisfied this condition.

I wasn't sure if you wanted it to now given the defaults below (should have added that point). 👍🏾

Ah, I see! I think 0 makes sense as the default here, I can't think of a more appropriate one.

michaelolo24 · 2021-08-05T17:47:06Z

...ck/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts

        );
-        const fullSignal = fullSource!._source; // If this doesn't exist the test is going to fail anyway so using a bang operator here to get rid of ts error
+        const fullSignal = fullSource?._source;
+        if (!fullSignal) {


kibanamachine · 2021-08-05T19:36:41Z

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`securitySolution`	6.5MB	6.5MB	+204.0B

History

💚 Build #143054 succeeded 34fb078
💚 Build #142739 succeeded 765e6c9
💚 Build #142521 succeeded e2f31cb
💔 Build #142486 failed 93aa2db
💔 Build #142366 failed 6c9bc3e

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

cc @rylnd

@ts-expect-error

…' package (elastic#107226) * Remove legacy imports from 'elasticsearch' package This prefers the newer types from '@elastic/elasticsearch'. There was one instance where mock data was insufficient to satisfy the newer analogous types; in all other cases this was just a find/replace. * Fix type errors with a null guard We know that this mock has hits with _source values, but we cannot convey this to typescript as null assertions are disabled within this project. This seems like the next best solution, preferable to a @ts-expect-error. * Fix a few more type errors * Replace legacy type imports in integration tests * refactors destructuring due to _source being properly declared as conditional * Update more integration tests to account for our optional _source Changes here fall into one of two categories: * If the test was making an assertion on a value from _source, we simply null chain and continue to assert on a possibly undefined value. * If the test logic depends on _source being present, we first assert that presence, and exit the test early if absent. * Fix more type errors Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

kibanamachine · 2021-08-05T19:39:43Z

💚 Backport successful

Status	Branch	Result
✅	7.x

This backport PR will be merged automatically after passing CI.

@ts-expect-error

…' package (#107226) (#107808) * Remove legacy imports from 'elasticsearch' package This prefers the newer types from '@elastic/elasticsearch'. There was one instance where mock data was insufficient to satisfy the newer analogous types; in all other cases this was just a find/replace. * Fix type errors with a null guard We know that this mock has hits with _source values, but we cannot convey this to typescript as null assertions are disabled within this project. This seems like the next best solution, preferable to a @ts-expect-error. * Fix a few more type errors * Replace legacy type imports in integration tests * refactors destructuring due to _source being properly declared as conditional * Update more integration tests to account for our optional _source Changes here fall into one of two categories: * If the test was making an assertion on a value from _source, we simply null chain and continue to assert on a possibly undefined value. * If the test logic depends on _source being present, we first assert that presence, and exit the test early if absent. * Fix more type errors Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Ryland Herrick <ryalnd@gmail.com>

@ts-expect-error

…' package (elastic#107226) * Remove legacy imports from 'elasticsearch' package This prefers the newer types from '@elastic/elasticsearch'. There was one instance where mock data was insufficient to satisfy the newer analogous types; in all other cases this was just a find/replace. * Fix type errors with a null guard We know that this mock has hits with _source values, but we cannot convey this to typescript as null assertions are disabled within this project. This seems like the next best solution, preferable to a @ts-expect-error. * Fix a few more type errors * Replace legacy type imports in integration tests * refactors destructuring due to _source being properly declared as conditional * Update more integration tests to account for our optional _source Changes here fall into one of two categories: * If the test was making an assertion on a value from _source, we simply null chain and continue to assert on a possibly undefined value. * If the test logic depends on _source being present, we first assert that presence, and exit the test early if absent. * Fix more type errors Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

…-png-pdf-report-type * 'master' of github.com:elastic/kibana: (392 commits) update linting doc (elastic#105748) [APM] Various improvements from elastic#104851 (elastic#107726) Update dependency @elastic/charts to v33.2.0 (master) (elastic#107842) Fix default route link on kibana homepage (elastic#107809) [APM] Invalidate trackPageview on route change (elastic#107741) Service map backend links (elastic#107317) [index patterns] index pattern create modal (elastic#101853) [RAC] integrating rbac search strategy with alert table (elastic#107242) [Security Solution] Siem signals -> alerts as data field and index aliases (elastic#106049) [Metrics UI] Add checkbox to optionally drop partial buckets (elastic#107676) [Metrics UI] Fix metric threshold preview regression (elastic#107674) Disable Product check in @elastic/elasticsearch-js (elastic#107642) [App Search] Migrate Crawler Status Indicator, Crawler Status Banner, and Crawl Request polling (elastic#107603) [Security Solution, Lists] Replace legacy imports from 'elasticsearch' package (elastic#107226) [maps] asset tracking tutorial (elastic#104552) [scripts/build_ts_refs] when using `--clean` initialize caches (elastic#107777) Upgrade EUI to v36.1.0 (elastic#107231) [RAC] [TGrid] Implements cell actions in the TGrid (elastic#107771) Realign cypress/ccs_integration with cypress/integration (elastic#107743) Allow optional OSS to X-Pack dependencies (elastic#107432) ... # Conflicts: # x-pack/examples/reporting_example/public/application.tsx # x-pack/examples/reporting_example/public/components/app.tsx # x-pack/plugins/canvas/public/services/legacy/stubs/reporting.ts # x-pack/plugins/reporting/common/types.ts # x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx # x-pack/plugins/reporting/public/management/mount_management_section.tsx # x-pack/plugins/reporting/public/management/report_listing.test.tsx # x-pack/plugins/reporting/public/plugin.ts # x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx # x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts

Remove legacy imports from 'elasticsearch' package

74d09fe

This prefers the newer types from '@elastic/elasticsearch'. There was one instance where mock data was insufficient to satisfy the newer analogous types; in all other cases this was just a find/replace.

rylnd added chore v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. auto-backport Deprecated - use backport:version if exact versions are needed v7.15.0 labels Jul 29, 2021

rylnd self-assigned this Jul 29, 2021

rylnd changed the title ~~[Security Solution, Lists]Replace legacy imports from 'elasticsearch' package~~ [Security Solution, Lists] Replace legacy imports from 'elasticsearch' package Jul 29, 2021

rylnd mentioned this pull request Jul 29, 2021

[Meta] Switch to the new Elasticsearch client #83910

Closed

74 tasks

rylnd marked this pull request as ready for review July 29, 2021 18:58

rylnd requested review from a team as code owners July 29, 2021 18:58

rylnd requested review from academo and parkiino July 29, 2021 18:58

rylnd removed request for academo and parkiino July 29, 2021 19:12

Fix type errors with a null guard

a108af5

We know that this mock has hits with _source values, but we cannot convey this to typescript as null assertions are disabled within this project. This seems like the next best solution, preferable to a @ts-expect-error.

FrankHassanabad approved these changes Jul 29, 2021

View reviewed changes

Fix a few more type errors

8746a88

rylnd added 4 commits August 2, 2021 10:51

Replace legacy type imports in integration tests

ef54ff6

* refactors destructuring due to _source being properly declared as conditional

Merge branch 'master' into replace-legacy-secsol-imports

6c9bc3e

Fix more type errors

e2f31cb

Merge branch 'master' into replace-legacy-secsol-imports

765e6c9

kibanamachine requested a review from a team as a code owner August 3, 2021 17:12

Merge branch 'master' into replace-legacy-secsol-imports

34fb078

Conflicts: x-pack/plugins/security_solution/public/cases/components/case_view/index.tsx

pzl approved these changes Aug 5, 2021

View reviewed changes

rylnd enabled auto-merge (squash) August 5, 2021 17:12

Merge branch 'master' into replace-legacy-secsol-imports

63aa115

michaelolo24 reviewed Aug 5, 2021

View reviewed changes

michaelolo24 approved these changes Aug 5, 2021

View reviewed changes

rylnd merged commit 8665f36 into elastic:master Aug 5, 2021

kibanamachine mentioned this pull request Aug 5, 2021

[7.x] [Security Solution, Lists] Replace legacy imports from 'elasticsearch' package (#107226) #107808

Merged

rylnd deleted the replace-legacy-secsol-imports branch August 5, 2021 20:47

rylnd mentioned this pull request Aug 10, 2021

[Security Solution, Timelines] Replace more legacy elasticsearch types #108087

Merged

1 task

Conversation

rylnd commented Jul 29, 2021

Summary

For maintainers

Uh oh!

elasticmachine commented Jul 29, 2021

Uh oh!

FrankHassanabad left a comment

Choose a reason for hiding this comment

Uh oh!

mshustov commented Jul 30, 2021

Uh oh!

rylnd commented Aug 2, 2021

Uh oh!

rylnd commented Aug 3, 2021

Uh oh!

pzl left a comment

Choose a reason for hiding this comment

Uh oh!

rylnd commented Aug 5, 2021

Uh oh!

michaelolo24 Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

michaelolo24 Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

rylnd Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

michaelolo24 Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

rylnd Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

michaelolo24 Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented Aug 5, 2021

💚 Build Succeeded

Metrics [docs]

Async chunks

History

Uh oh!

kibanamachine commented Aug 5, 2021

💚 Backport successful

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants