Skip to content

Xpack plugin uses NP Licensing plugin to get license data#52994

Merged
mshustov merged 2 commits intoelastic:masterfrom
mshustov:fix-wrong-impor
Dec 13, 2019
Merged

Xpack plugin uses NP Licensing plugin to get license data#52994
mshustov merged 2 commits intoelastic:masterfrom
mshustov:fix-wrong-impor

Conversation

@mshustov
Copy link
Copy Markdown
Contributor

@mshustov mshustov commented Dec 13, 2019

Summary

#52507 was reverted due to merge race error. This PR contain reverted commit + fixes a broken import in Graph plugin

)

* convert xpackinfo to TS

* use NP Licensing plugin in XPackInfo

* update mocks

* put license regresh hack back.

otherwise new license won't be re-fetched when signature changed. was deleted by mistake

* add functional test for legacy xpackmain

* declare setup types on client & server explicitly

* rename mock license --> licensing to match plugin name

* add tests for createLicensePoller

* fix type error

* adopt tests for xpack_info

* createXPackInfo uses new platform API

* put back error mute

* address comments

* fix renamed import

* address comment

* update tests to reduce delays

* deprecate xpack.xpack_main.xpack_api_polling_frequency_millis

* use snake_case in config
@mshustov mshustov added Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// Feature:New Platform labels Dec 13, 2019
@mshustov mshustov requested a review from a team December 13, 2019 15:02
@mshustov mshustov requested a review from a team as a code owner December 13, 2019 15:02
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-platform (Team:Platform)

@mshustov mshustov added release_note:skip Skip the PR/issue when compiling release notes v7.6.0 labels Dec 13, 2019
@mshustov mshustov requested a review from flash1293 December 13, 2019 15:04
Copy link
Copy Markdown
Contributor

@flash1293 flash1293 left a comment

Choose a reason for hiding this comment

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

Graph changes LGTM, thanks for fixing that 👍

@mshustov mshustov merged commit 6c1f248 into elastic:master Dec 13, 2019
@mshustov mshustov deleted the fix-wrong-impor branch December 13, 2019 17:09
spalger added a commit that referenced this pull request Dec 13, 2019
spalger added a commit to spalger/kibana that referenced this pull request Dec 13, 2019
spalger added a commit that referenced this pull request Dec 13, 2019
mshustov added a commit to mshustov/kibana that referenced this pull request Dec 16, 2019
* Licensing plugin and XPackInfo uses the same license data (elastic#52507)

* convert xpackinfo to TS

* use NP Licensing plugin in XPackInfo

* update mocks

* put license regresh hack back.

otherwise new license won't be re-fetched when signature changed. was deleted by mistake

* add functional test for legacy xpackmain

* declare setup types on client & server explicitly

* rename mock license --> licensing to match plugin name

* add tests for createLicensePoller

* fix type error

* adopt tests for xpack_info

* createXPackInfo uses new platform API

* put back error mute

* address comments

* fix renamed import

* address comment

* update tests to reduce delays

* deprecate xpack.xpack_main.xpack_api_polling_frequency_millis

* use snake_case in config

* fix wrong import
mshustov added a commit that referenced this pull request Dec 16, 2019
* Fix wrong impor (#52994)

* Licensing plugin and XPackInfo uses the same license data (#52507)

* convert xpackinfo to TS

* use NP Licensing plugin in XPackInfo

* update mocks

* put license regresh hack back.

otherwise new license won't be re-fetched when signature changed. was deleted by mistake

* add functional test for legacy xpackmain

* declare setup types on client & server explicitly

* rename mock license --> licensing to match plugin name

* add tests for createLicensePoller

* fix type error

* adopt tests for xpack_info

* createXPackInfo uses new platform API

* put back error mute

* address comments

* fix renamed import

* address comment

* update tests to reduce delays

* deprecate xpack.xpack_main.xpack_api_polling_frequency_millis

* use snake_case in config

* fix wrong import

* prevent eslint error with renaming mock file
@mshustov mshustov changed the title Fix wrong impor Xpack plugin uses NP Licensing plugin to get license data Dec 16, 2019
@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

History

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backported Feature:New Platform release_note:skip Skip the PR/issue when compiling release notes Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// v7.6.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants