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

[plugin installer] Allow x-pack removal if it exists #19327

Merged
merged 2 commits into from
Jun 8, 2018

Conversation

jbudz
Copy link
Member

@jbudz jbudz commented May 22, 2018

When performing an in-place upgrade from an install with x-pack to the default distribution in 6.3, an old x-pack install is unable to be removed with the plugin installer after upgrading. This lets the plugin installer remove plugins/x-pack regardless of distribution if it exists.

This also rewrites the tests to jest. At some point between when this was written and merged, the other tests were updated, so this gets the rest up to speed.

To test, in the distribution including x-pack:

  • bin/kibana-plugin remove x-pack with an x-pack plugin in the plugins folder should remove the plugin
  • bin/kibana-plugin remove x-pack without an x-pack plugin should message You are using the standard distrbution of Kibana. Please install the OSS-only distribution to remove X-Pack features.

Part of #18813

@jbudz jbudz added review Team:Operations Team label for Operations Team v6.3.0 labels May 22, 2018
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@jbudz
Copy link
Member Author

jbudz commented May 29, 2018

/cc @elastic/kibana-operations

@tylersmalley tylersmalley self-requested a review May 29, 2018 16:21
Copy link
Contributor

@tylersmalley tylersmalley left a comment

Choose a reason for hiding this comment

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

LGTM - though I don't know how someone could get into this state. Tested by copying the x-pack plugin from a previous install.

@tylersmalley
Copy link
Contributor

Should be able to resolve the conflicts by running eslint --fix

Copy link
Member

@mistic mistic left a comment

Choose a reason for hiding this comment

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

LGTM. (just reviewed the code)

@jbudz jbudz added v6.3.1 and removed v6.3.0 labels Jun 1, 2018
@elasticmachine
Copy link
Contributor

💔 Build Failed

@jbudz
Copy link
Member Author

jbudz commented Jun 8, 2018

retest

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@jbudz jbudz merged commit c8216de into elastic:master Jun 8, 2018
jbudz added a commit that referenced this pull request Jun 8, 2018
* [plugin installer] Allow x-pack removal if it exists

* remove lingering exit
@jbudz
Copy link
Member Author

jbudz commented Jun 8, 2018

6.x/6.4: b0f1305
6.3.1: 26aa0ea

jbudz added a commit to jbudz/kibana that referenced this pull request Jun 15, 2018
* [plugin installer] Allow x-pack removal if it exists

* remove lingering exit
jbudz added a commit that referenced this pull request Jun 15, 2018
* [plugin installer] Allow x-pack removal if it exists

* remove lingering exit
@mistic
Copy link
Member

mistic commented Jun 20, 2018

@jbudz just updated your last comment to include the merge hash for the backport PR to 6.3.1 😃

maryia-lapata pushed a commit to maryia-lapata/kibana that referenced this pull request Jun 25, 2018
* [plugin installer] Allow x-pack removal if it exists

* remove lingering exit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants