Skip to content

[7.x] [kbnArchiver] convert archive names to root-relative paths (#101839)#101936

Merged
spalger merged 2 commits intoelastic:7.xfrom
spalger:backport/7.x/pr-101839
Jun 10, 2021
Merged

[7.x] [kbnArchiver] convert archive names to root-relative paths (#101839)#101936
spalger merged 2 commits intoelastic:7.xfrom
spalger:backport/7.x/pr-101839

Conversation

@spalger
Copy link
Contributor

@spalger spalger commented Jun 10, 2021

Backports the following commits to 7.x:

…01839)

* [kbnArchiver] convert archive names to root-relative paths

* ensure that newly multiline hooks are explicitly async

* missed a newly multiline hook

* fix exists check

* avoid extra lines by wrapping arrow body in {}

* one block more

* fix errant `name` variable

Co-authored-by: spalger <spalger@users.noreply.github.com>
# Conflicts:
#	test/api_integration/apis/kql_telemetry/kql_telemetry.ts
#	test/api_integration/apis/saved_objects/bulk_create.ts
#	test/api_integration/apis/saved_objects/bulk_get.ts
#	test/api_integration/apis/saved_objects/bulk_update.ts
#	test/api_integration/apis/saved_objects/create.ts
#	test/api_integration/apis/saved_objects/delete.ts
#	test/api_integration/apis/saved_objects/export.ts
#	test/api_integration/apis/saved_objects/find.ts
#	test/api_integration/apis/saved_objects/get.ts
#	test/api_integration/apis/saved_objects/import.ts
#	test/api_integration/apis/saved_objects/resolve.ts
#	test/api_integration/apis/saved_objects/resolve_import_errors.ts
#	test/api_integration/apis/saved_objects/update.ts
#	test/api_integration/apis/saved_objects_management/find.ts
#	test/api_integration/apis/saved_objects_management/get.ts
#	test/api_integration/apis/saved_objects_management/relationships.ts
#	test/api_integration/apis/shorten/index.js
#	test/api_integration/apis/stats/stats.js
#	test/api_integration/apis/suggestions/suggestions.js
#	test/functional/apps/discover/_discover.ts
@spalger spalger added the backport This PR is a backport of another PR label Jun 10, 2021
@spalger spalger enabled auto-merge (squash) June 10, 2021 17:50
@spalger
Copy link
Contributor Author

spalger commented Jun 10, 2021

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

@spalger spalger merged commit 34c5979 into elastic:7.x Jun 10, 2021
@spalger spalger deleted the backport/7.x/pr-101839 branch June 10, 2021 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants