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

[Archive Migration] x-pack..dashboard_view_mode #108503

Merged
merged 3 commits into from
Aug 19, 2021

Conversation

wayneseymour
Copy link
Member

@wayneseymour wayneseymour commented Aug 13, 2021

Delete x-pack/test/functional/es_archives/dashboard_view_mode.
Add x-pack/test/functional/fixtures/kbn_archiver/dashboard_view_mode.json.

Update test to use the newly added archive.

Helps #102552

@wayneseymour wayneseymour added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes auto-backport Deprecated - use backport:version if exact versions are needed v7.15.0 labels Aug 13, 2021
@wayneseymour wayneseymour self-assigned this Aug 13, 2021
@wayneseymour wayneseymour force-pushed the archive-migration/xpack-dashboard_view_mode branch from c170ce0 to 574f214 Compare August 13, 2021 15:20
@wayneseymour wayneseymour marked this pull request as ready for review August 16, 2021 09:57
@wayneseymour
Copy link
Member Author

@elasticmachine merge upstream

Copy link

@LeeDr LeeDr left a comment

Choose a reason for hiding this comment

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

I think we need a bit more cleanup in the after method.

Also, it seems there's a mix of user/role functionality here. I didn't run the test but it looks like it might be going through the roles UI to create roles? If so, we should clean that up and use the test_user service.

after(async () => {
await kibanaServer.importExport.unload(
'x-pack/test/functional/fixtures/kbn_archiver/dashboard_view_mode'
);
Copy link

Choose a reason for hiding this comment

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

I don't think this unload is actually enough in this test. This test file saves a new saved search and a new dashboard. I think we would want to clean those with something like .clean(['search', 'dashboard'[);

Copy link
Member Author

Choose a reason for hiding this comment

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

@LeeDr Looks like the test user svc is already restoring defaults. Is there more to be done regarding test users?

Copy link

Choose a reason for hiding this comment

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

It's not about the test user, it's about the saved objects. Currently the test does this;

  1. load some saved objects from a kbnArchive
  2. save some new SOs as a part of the test
  3. unload the SOs from step 1. This leaves the SOs that were created in step 2. The test should clean those up (delete the SOs).

Copy link
Member Author

Choose a reason for hiding this comment

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

I think the latest push addresses this boss.

@wayneseymour wayneseymour force-pushed the archive-migration/xpack-dashboard_view_mode branch from d47be1f to f4b3253 Compare August 18, 2021 10:32
Delete `x-pack/test/functional/es_archives/dashboard_view_mode`.
Add `x-pack/test/functional/fixtures/kbn_archiver/dashboard_view_mode.json`.

Update test to use the newly added archive.
Signed-off-by: Tre' Seymour <wayne.seymour@elastic.co>
@wayneseymour wayneseymour force-pushed the archive-migration/xpack-dashboard_view_mode branch from f4b3253 to b8f43ed Compare August 18, 2021 13:08
@mistic mistic added v7.16.0 and removed v7.15.0 labels Aug 18, 2021
Signed-off-by: Tre' Seymour <wayne.seymour@elastic.co>
@wayneseymour
Copy link
Member Author

@mistic my thanks mate :)

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

cc @wayneseymour

@wayneseymour wayneseymour requested review from rashmivkulkarni and removed request for LeeDr August 19, 2021 16:12
Copy link

@LeeDr LeeDr left a comment

Choose a reason for hiding this comment

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

LGTM - only code reviews

@wayneseymour wayneseymour merged commit 7f68ff2 into master Aug 19, 2021
@wayneseymour wayneseymour deleted the archive-migration/xpack-dashboard_view_mode branch August 19, 2021 18:48
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Aug 19, 2021
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
7.x

This backport PR will be merged automatically after passing CI.

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Aug 23, 2021
wayneseymour added a commit that referenced this pull request Aug 30, 2021
Comes from #102827

Helps with #108503

Piggy back off of the work from @tylersmalley
Only include the changes under the
test/functional/apps/discover folder.
wayneseymour added a commit that referenced this pull request Aug 30, 2021
Comes from #102827

Helps with #108503

Piggy back off of the work from @tylersmalley
Only include the changes under the
test/plugin_functional/test_suites/doc_views &
test/visual_regression/tests/discover folders.
wayneseymour added a commit that referenced this pull request Aug 30, 2021
Comes from #102827

Helps with #108503

Piggy back off of the work from @tylersmalley
Only include the changes under the
test/functional/apps/home folder.
wayneseymour added a commit that referenced this pull request Aug 30, 2021
Comes from #102827

Helps with #108503

Piggy back off of the work from @tylersmalley
Only include the changes under the
test/functional/apps/management folder.
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Aug 31, 2021
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

1 similar comment
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

@LeeDr LeeDr added v7.16.0 and removed v7.15.0 labels Sep 1, 2021
wayneseymour added a commit that referenced this pull request Sep 1, 2021
Comes from #102827

Helps with #108503

Unload shakespeare data,
set default index.

Only include the changes under the
test/functional/apps/home folder.
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

2 similar comments
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

wayneseymour added a commit that referenced this pull request Sep 7, 2021
Comes from #102827

Helps with #108503

Unload shakespeare data,
set default index.

Only include the changes under the
test/functional/apps/home folder.
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Sep 7, 2021
kibanamachine added a commit that referenced this pull request Sep 7, 2021
Co-authored-by: Tre <wayne.seymour@elastic.co>
wayneseymour added a commit that referenced this pull request Sep 8, 2021
Comes from #102827

Helps with #108503

Only include the changes under the
test/functional/apps/management folder.
wayneseymour added a commit that referenced this pull request Sep 15, 2021
* [Archive Migration][Partial] discover apps-management

Comes from #102827

Helps with #108503

Only include the changes under the
test/functional/apps/management folder.

* Remove the index pattern, that the test
creates.

* Drop beforeEach(), in favour of before(),
since there's only one test.

* Drop outdated comment,
drop these three cleanup lines
as the unload should handle it.

* Just keep one cleanup.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Sep 15, 2021
* [Archive Migration][Partial] discover apps-management

Comes from elastic#102827

Helps with elastic#108503

Only include the changes under the
test/functional/apps/management folder.

* Remove the index pattern, that the test
creates.

* Drop beforeEach(), in favour of before(),
since there's only one test.

* Drop outdated comment,
drop these three cleanup lines
as the unload should handle it.

* Just keep one cleanup.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kibanamachine added a commit that referenced this pull request Sep 15, 2021
)

* [Archive Migration][Partial] discover apps-management

Comes from #102827

Helps with #108503

Only include the changes under the
test/functional/apps/management folder.

* Remove the index pattern, that the test
creates.

* Drop beforeEach(), in favour of before(),
since there's only one test.

* Drop outdated comment,
drop these three cleanup lines
as the unload should handle it.

* Just keep one cleanup.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Tre <wayne.seymour@elastic.co>
wayneseymour added a commit that referenced this pull request Sep 16, 2021
Comes from #102827

Helps with #108503

Piggy back off of the work from @tylersmalley
Only include the changes under the
test/plugin_functional/test_suites/doc_views &
test/visual_regression/tests/discover folders.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes v7.16.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants