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.

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

[kbnArchiver] convert archive names to root-relative paths #101839

Merged

Conversation

spalger
Copy link
Contributor

@spalger spalger commented Jun 9, 2021

Just like in #101345, this drops support for the --dir command line flag and removes the mechanism that resolves kbnArchives based on pre-configured locations which are different for each FTR config. When using the kibanaServer.importExport.load() API you will now need to use a root-relative path, regardless of which FTR config you are writing tests in.

-kibanaServer.importExport.load('saved_objects/references')
+kibanaServer.importExport.load('test/api_integration/fixtures/kbn_archiver/saved_objects/references.json')

Hooray for consistency!

@spalger spalger added release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v7.14.0 v8.0.0 labels Jun 9, 2021
@spalger spalger marked this pull request as ready for review June 9, 2021 21:18
@spalger spalger requested a review from a team as a code owner June 9, 2021 21:18
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@spalger spalger enabled auto-merge (squash) June 9, 2021 23:48
@spalger spalger added the auto-backport Deprecated - use backport:version if exact versions are needed label Jun 9, 2021
@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 7917e3c into elastic:master Jun 10, 2021
@spalger spalger deleted the implement/kbn-archiver/root-relative-paths branch June 10, 2021 00:13
@kibanamachine
Copy link
Contributor

💔 Backport failed

Status Branch Result
7.x Commit could not be cherrypicked due to conflicts

To backport manually run:
node scripts/backport --pr 101839

rylnd added a commit to rylnd/kibana that referenced this pull request Jun 10, 2021
* master: (173 commits)
  [kbnArchiver] convert archive names to root-relative paths (elastic#101839)
  [Reporting] Make "ScreenCapturePanel" shareable for Canvas (elastic#100623)
  [Alerting UI] Converted Rules and Connectors management pages to new layout. (elastic#101697)
  [Fleet] Support granular integrations in policy editor (elastic#101531)
  [Security Solution][Detections] Update detection alert mappings to ECS v1.10.0 (elastic#101680)
  [Fleet] Integrations UI: Adjust policies list UI (elastic#101600)
  chore(NA): moving @kbn/server-route-repository into bazel (elastic#101484)
  Support owner and description attributes inside the Manifest file, use in API docs (elastic#101786)
  [Security Solution] fix security empty overview links (elastic#101536)
  Unskips migration tests now that elastic search is fixed (elastic#101682)
  Fix endpoint -> integrations onboarding link (elastic#101804)
  [Alerting] Log warning when rules are not rescheduled due to Saved Object not found error (elastic#101591)
  Update datafeed_high_count_network_denies.json (elastic#101681)
  [Index patterns] Field editor example app (elastic#100524)
  [DOCS] Adding file upload to add data page (elastic#101674)
  [Security Solution][Endpoint] Adds Endpoint Host Isolation Status common component (elastic#101782)
  Upgrade ws v7.3.1->v7.4.2 and v6.2.1->v6.2.2 (elastic#101402)
  fixes embeddables migrate function  (elastic#101470)
  [Canvas] Update slow query in sample ecommerce workpad (elastic#100714)
  clarify which parts of TM are experimental (elastic#101757)
  ...
jloleysens added a commit to jloleysens/kibana that referenced this pull request Jun 10, 2021
…add-agent-flyout

* 'master' of github.com:elastic/kibana: (35 commits)
  [Cases] Improve connectors mapping (elastic#101145)
  [ML] Fixes display of job group badges in recognizer wizard (elastic#101775)
  Fix es_archives path (elastic#101737)
  [kbnArchiver] convert archive names to root-relative paths (elastic#101839)
  [Reporting] Make "ScreenCapturePanel" shareable for Canvas (elastic#100623)
  [Alerting UI] Converted Rules and Connectors management pages to new layout. (elastic#101697)
  [Fleet] Support granular integrations in policy editor (elastic#101531)
  [Security Solution][Detections] Update detection alert mappings to ECS v1.10.0 (elastic#101680)
  [Fleet] Integrations UI: Adjust policies list UI (elastic#101600)
  chore(NA): moving @kbn/server-route-repository into bazel (elastic#101484)
  Support owner and description attributes inside the Manifest file, use in API docs (elastic#101786)
  [Security Solution] fix security empty overview links (elastic#101536)
  Unskips migration tests now that elastic search is fixed (elastic#101682)
  Fix endpoint -> integrations onboarding link (elastic#101804)
  [Alerting] Log warning when rules are not rescheduled due to Saved Object not found error (elastic#101591)
  Update datafeed_high_count_network_denies.json (elastic#101681)
  [Index patterns] Field editor example app (elastic#100524)
  [DOCS] Adding file upload to add data page (elastic#101674)
  [Security Solution][Endpoint] Adds Endpoint Host Isolation Status common component (elastic#101782)
  Upgrade ws v7.3.1->v7.4.2 and v6.2.1->v6.2.2 (elastic#101402)
  ...

# Conflicts:
#	x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
#	x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
#	x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx
#	x-pack/plugins/fleet/public/components/agent_enrollment_flyout/standalone_instructions.tsx
jloleysens added a commit to jloleysens/kibana that referenced this pull request Jun 10, 2021
…add-integrations-redirect

* 'master' of github.com:elastic/kibana: (44 commits)
  Allow navigating discover flyout via arrow keys (elastic#101772)
  [Cases] Improve connectors mapping (elastic#101145)
  [ML] Fixes display of job group badges in recognizer wizard (elastic#101775)
  Fix es_archives path (elastic#101737)
  [kbnArchiver] convert archive names to root-relative paths (elastic#101839)
  [Reporting] Make "ScreenCapturePanel" shareable for Canvas (elastic#100623)
  [Alerting UI] Converted Rules and Connectors management pages to new layout. (elastic#101697)
  [Fleet] Support granular integrations in policy editor (elastic#101531)
  [Security Solution][Detections] Update detection alert mappings to ECS v1.10.0 (elastic#101680)
  [Fleet] Integrations UI: Adjust policies list UI (elastic#101600)
  chore(NA): moving @kbn/server-route-repository into bazel (elastic#101484)
  Support owner and description attributes inside the Manifest file, use in API docs (elastic#101786)
  [Security Solution] fix security empty overview links (elastic#101536)
  Unskips migration tests now that elastic search is fixed (elastic#101682)
  Fix endpoint -> integrations onboarding link (elastic#101804)
  [Alerting] Log warning when rules are not rescheduled due to Saved Object not found error (elastic#101591)
  Update datafeed_high_count_network_denies.json (elastic#101681)
  [Index patterns] Field editor example app (elastic#100524)
  [DOCS] Adding file upload to add data page (elastic#101674)
  [Security Solution][Endpoint] Adds Endpoint Host Isolation Status common component (elastic#101782)
  ...

# Conflicts:
#	x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
#	x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
semd pushed a commit that referenced this pull request Jun 10, 2021
* [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>
spalger pushed a commit to spalger/kibana that referenced this pull request Jun 10, 2021
…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 pushed a commit that referenced this pull request Jun 10, 2021
…101936)

* [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

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v7.14.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants