Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes custom header check on 404 responses, includes es client ProductNotSupportedError in EsUnavailableError conditional #116029

Merged
merged 2 commits into from
Oct 22, 2021
Merged

Removes custom header check on 404 responses, includes es client ProductNotSupportedError in EsUnavailableError conditional #116029

merged 2 commits into from
Oct 22, 2021

Conversation

TinaHeiligers
Copy link
Contributor

Part of #113950

The ES client will throw a ProductNotSupportedError for any request that doesn’t contain the 'x-elastic-product' header
https://github.com/elastic/elastic-transport-js/blob/0e0d3a731792cc4f72e50fa8adfe372a227a6a72/src/Transport.ts#L464-L466

This means that we can remove the custom logic we introduced in the Reference PRs.

This PR:

  • Removes custom handling of product header check in saved objects repository client calls (see reference PRs below)
  • Adds ProductNotSupportedError to error types the saved objects repository converts to EsUnavailableError type.
  • Updates unit tests.
  • Updates integration test for checking 404 proxy responses.

Reference PRs:

@TinaHeiligers TinaHeiligers requested a review from a team as a code owner October 22, 2021 01:13
@TinaHeiligers TinaHeiligers requested review from mshustov and pgayvallet and removed request for a team October 22, 2021 01:14
TinaHeiligers
TinaHeiligers commented Oct 22, 2021
View reviewed changes
src/core/server/saved_objects/service/lib/integration_tests/repository_with_proxy.test.ts
`x-elastic-product not present or not recognized: Not Found`
);
}
expect(err?.output?.payload?.message).toBe(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only a small change was needed here 😄

@kibanamachine
Copy link
Contributor

kibanamachine commented Oct 22, 2021 •
edited
Loading

💔 Build Failed

Failed CI Steps

Test Failures

  • [job] [logs] Default CI Group #3 / Discover discover async search relative timerange works
  • [job] [logs] Default CI Group #3 / Discover discover async search relative timerange works

Metrics [docs]

‼️ ERROR: no builds found for mergeBase sha [f5b9335]

History

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

@mshustov mshustov merged commit ed2d516 into elastic:issue-108387-es-client-80 Oct 22, 2021
@TinaHeiligers TinaHeiligers deleted the remove-custom-product-support-header-check branch October 22, 2021 13:58
mshustov added a commit that referenced this pull request Oct 26, 2021
@mshustov @pgayvallet @TinaHeiligers
[ES] Upgrade client to v8.0 (#113950)
3c8fa52 
* bump to a pre-8.0 version

* export KibanaClient from /lib sub-folder

* workaround the problem of the absence of estypes

* update es client usage in pacakges

* export estypes from another path

* import errors from root

* import errors from root 2

* update transport import

* update import path for /api/types

* update import path for /api/types

* import errors from top export

* use TransportResult instead if ApiResponse

* fix errors in client_config

* fix src/core/server/saved_objects/migrationsv2/actions/integration_tests/actions.test.ts

* use KibanaClient in mock. we dont export the original Client

* fix client mocks

* fix errors on SO

* fix remaining core errors

* update estype import path

* fix errors in data plugin

* fix data_views

* fix es_ui_shared

* fix errors in interactive_setup

* fix errors in ./test folder

* add @elastic/transport to the runtime deps

* fix errors in packages

* fix erros in src/core

* fix errors in test/

* fix an error in actions plugin

* woraround and fix errors in APM plugin

* fix errors in canvas

* fix errors in event_log

* fix errors in fleet

* fix errors in ILM

* fix errors in infra

* fix errors in ingest_pipeline

* fix errors in lens

* fix errors in license_management

* fix errors in licensing

* fix errors in logstash

* fix errors in ml

* fix errors in monitoring

* fix errors in observability

* fix errors in rule_registry

* fix errors in reporting

* fix errors in rule_registry

* fix errors in security

* fix errors in security_solution

* fix errors in snapshot_restore

* fix errors in transform

* fix errors in UA

* fix errors in uptime

* fix errors in x-pack/test

* fix eslint errors

* fix new errors

* use default HTTP Connection. Undici does not support agent config options keepAlive and maxSockets

* create does not accept require_alias option

* update deps

* use transport types exported from ES client package

* fix ErrorCause | string errors

* do not use enum

* fix errors in data plugin

* update x-pack code

* fix transport

* fix apm search request

* do not crash on reporting

* fix kbn-test build

* mute reporting error to start

* fix ftr build

* another attempt

* update import path

* address or mute new errors

* REMOVE me. pin transport version temporarily.

* remove deep imports from transport package

* fix jest crash

* fix product check tests

* remove unnecessary ts-expect-error

* fix a few failed unit tests

* bump to canary 24

* remove unnecessary ts-expect-error

* remove dependency on transport

* fix types in tests

* mute errors in xpack tests

* product check doesn;t  spam in logs anymore

* filterPath --> filter_path

* ignoreUnavailable --> ignore_unavailable

* ignoreUnavailable --> ignore_unavailable

* trackScores --> track_scores

* trackTotalHits --> track_total_hits

* fix es-arcives

* fix data plugin crashes

* fix watcher test utils

* rollback unnecessary changes

* fix another problem in es-archiver

* fix scroll. for whatever reason scroll fails when request scroll_id in body

* add meta: true in kbn-securitysolution-es-utils

* bump client to canary 25

* fix errors in accordance with the es client spec

* update securityscolution-es-utils

* unify scroll api in reporting and fix tests

* fix unit tests in watcher

* refactor APM to abort request with AbortController API

* fix missing es client calls in tests

* fix missing meta in detection engine FTR tests

* fix another bunch of errors in js tests

* fix wrong coercion

* remove test-grep pattern

* fix apm unit test

* rename terminateAfter to terminate_after in infra plugin

* rename terminateAfter to terminate_after in uptime plugin

* rename terminateAfter to terminate_after in apm plugin

* fix security roles FTR tests

* fix reference

* fix post_privilidges test

* fix post_privilidges

* bump client to 26

* add meta for index_management test helpers

* remove ts-expect-error caused by bad type in reason

* bump client to 27

* REMOVE me. workaround until fixed in the es client

* fix incorrect type casting

* swtich from camelCase params

* use `HttpConnection` for FTR-related clients

* bump client to 29

* Revert "REMOVE me. workaround until fixed in the es client"

This reverts commit c038850.

* fix new util

* revert repository changes

* do not crash if cannot store event_loop data

* fix new estypes imports

* fix more types

* fix security test types and add ts-ignore for custom ES client

* fix more estypes imports

* yet more ts violations

* line by line fixing is hard

* adapt `evaluateAlert` from infra as it's also used from FTR tests

* use convertToKibanaClient in FTR test instead of meta:true in plugin code

* migrate from deprecated API in fleet

* fix intergration tests

* fix fleet tests

* fix another fleet test

* fix more tests

* let's call it a day

* Removes custom header check on 404 responses, includes es client ProductNotSupportedError in EsUnavailableError conditional (#116029)

* Removes custom header check on 404 responses, includes es client ProductNotSupportedError in EsUnavailableError conditional

* Updates proxy response integration test

* disable APM until compatible with client v8

* skip async_search FTR test

* use kbnClient in integration tests

* bump version to 29

* bump to 30

* have configureClient return a KibanaClient instead of Client, remove resolved violations.

* bump to 31

* bump to 31

* Revert "bump to 31"

This reverts commit 5ac713e.

* trigger stop to unusubscribe

* update generated docs

* remove obsolete test

* put "as" back

* cleanup

* skip test

* remove new type errors in apm package

* remove ErrorCause casting

* update a comment

* bump version to 32

* remove unnecessary ts-expect-error in apm code

* update comments

* update to client v33

* remove outdated type definition

* bump to 34 without params mutation

* unskip the test that should not fail anymore

* remove unnecessary ts-expect-error comments

* update to v35. body can be string

* move `sort` to body and use body friendly syntax

* fix a failing test. maps register the same SO that has been already registered by home

Co-authored-by: pgayvallet <[email protected]>
Co-authored-by: Christiane (Tina) Heiligers <[email protected]>
@mshustov mshustov mentioned this pull request Dec 17, 2021
Merged
@TinaHeiligers TinaHeiligers restored the remove-custom-product-support-header-check branch December 17, 2021 19:23
@TinaHeiligers TinaHeiligers deleted the remove-custom-product-support-header-check branch December 17, 2021 19:24
@TinaHeiligers TinaHeiligers restored the remove-custom-product-support-header-check branch December 17, 2021 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mshustov mshustov Awaiting requested review from mshustov

@pgayvallet pgayvallet Awaiting requested review from pgayvallet

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TinaHeiligers @kibanamachine @mshustov