From 18a0a3f72cacf97073d3e943a1caf8d8a284c3d2 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 18 Apr 2017 22:54:18 -0700 Subject: [PATCH] Plugins: Remove leniency for missing plugins dir This leniency was left in after plugin installer refactoring for 2.0 because some tests still relied on it. However, the need for this leniency no longer exists. --- .../org/elasticsearch/plugins/InstallPluginCommand.java | 5 ----- .../elasticsearch/plugins/InstallPluginCommandTests.java | 9 --------- 2 files changed, 14 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java index 7360eef9238a4..a597fdcc5a2d3 100644 --- a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java +++ b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java @@ -205,11 +205,6 @@ void execute(Terminal terminal, String pluginId, boolean isBatch, Environment en if (pluginId == null) { throw new UserException(ExitCodes.USAGE, "plugin id is required"); } - // TODO: remove this leniency!! is it needed anymore? - if (Files.exists(env.pluginsFile()) == false) { - terminal.println("Plugins directory [" + env.pluginsFile() + "] does not exist. Creating..."); - Files.createDirectory(env.pluginsFile()); - } Path pluginZip = download(terminal, pluginId, env.tmpFile()); Path extractedZip = unzip(pluginZip, env.pluginsFile()); diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java index 732852ca1533b..a70b8a8d3d4a0 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java @@ -345,15 +345,6 @@ public void testUnknownPlugin() throws Exception { assertTrue(e.getMessage(), e.getMessage().contains("Unknown plugin foo")); } - public void testPluginsDirMissing() throws Exception { - Tuple env = createEnv(fs, temp); - Files.delete(env.v2().pluginsFile()); - Path pluginDir = createPluginDir(temp); - String pluginZip = createPlugin("fake", pluginDir); - installPlugin(pluginZip, env.v1()); - assertPlugin("fake", pluginDir, env.v2()); - } - public void testPluginsDirReadOnly() throws Exception { assumeTrue("posix and filesystem", isPosix && isReal); Tuple env = createEnv(fs, temp);