Remove flavor from build #85796
Remove flavor from build #85796
Conversation
The default distribution is the only remaining build flavor, and has been for quite a while now. This commit removes flavor from the internal Build class. It keeps rest api compat for nodes info for now by hardcoding `default`.
rjernst
added
:Delivery/Packaging
elasticmachine
added
Team:Delivery
|
Pinging @elastic/es-delivery (Team:Delivery) |
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
| @@ -225,7 +225,7 @@ public void execute(List<PluginDescriptor> plugins) throws Exception { | |||
| terminal.println(logPrefix + "Installing " + pluginId); | |||
| try { | |||
| if ("x-pack".equals(pluginId)) { | |||
| handleInstallXPack(buildFlavor()); | |||
| throw new UserException(ExitCodes.CONFIG, "this distribution of Elasticsearch contains X-Pack by default"); | |||
There was a problem hiding this comment.
Do we even need to handle this anymore at this point. The "x-pack" plugin hasn't been a thing for many versions. I assume this was only added to ease migration after x-pack was folded into ES.
There was a problem hiding this comment.
That is a fair point, but I would like to think about that separately. We certainly might get users who have used ES before trying to install x-pack, though at some point we should definitely remove this.
| case "oss": | ||
| return Flavor.OSS; | ||
| case "unknown": | ||
| return Flavor.UNKNOWN; |
There was a problem hiding this comment.
What do we use for the integ-test distribution? Was this "unknown" before?
There was a problem hiding this comment.
Yes it would have been unknown, though I don't think it matters, since nothing will be checking it now.
The default distribution is the only remaining build flavor, and has been for
quite a while now. This commit removes flavor from the internal Build
class. It keeps rest api compat for nodes info for now by hardcoding
default.