github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPE on plugin sync (#115640)

Browse source
This commit is contained in:
Lorenzo Dematté 2024-10-28 09:33:14 +01:00 • committed by GitHub
parent ef85d0a53f
commit c4c33ff359
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/SyncPluginsAction.java
View file

@ -25,6 +25,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@ -60,7 +61,7 @@ public class SyncPluginsAction {
* @throws UserException if a plugins config file is found.
*/
public static void ensureNoConfigFile(Environment env) throws UserException {
final Path pluginsConfig = env.configFile().resolve("elasticsearch-plugins.yml");
final Path pluginsConfig = env.configFile().resolve(ELASTICSEARCH_PLUGINS_YML);
if (Files.exists(pluginsConfig)) {
throw new UserException(
ExitCodes.USAGE,
@ -207,9 +208,8 @@ public class SyncPluginsAction {
Optional<PluginsConfig> cachedPluginsConfig,
List<PluginDescriptor> existingPlugins
) {
final Map<String, String> cachedPluginIdToLocation = cachedPluginsConfig.map(
config -> config.getPlugins().stream().collect(Collectors.toMap(InstallablePlugin::getId, InstallablePlugin::getLocation))
).orElse(Map.of());
final Map<String, String> cachedPluginIdToLocation = new HashMap<>();
cachedPluginsConfig.ifPresent(config -> config.getPlugins().forEach(p -> cachedPluginIdToLocation.put(p.getId(), p.getLocation())));
return pluginsToMaybeUpgrade.stream().filter(eachPlugin -> {
final String eachPluginId = eachPlugin.getId();

16
distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/SyncPluginsActionTests.java
View file

@ -157,6 +157,22 @@ public class SyncPluginsActionTests extends ESTestCase {
assertThat(pluginChanges.upgrade.get(0).getId(), equalTo("analysis-icu"));
}
/**
* Check that when there is an official plugin in the config file and in the cached config, then we
* calculate that the plugin does not need to be upgraded.
*/
public void test_getPluginChanges_withOfficialPluginCachedConfigAndNoChanges_returnsNoChanges() throws Exception {
createPlugin("analysis-icu");
config.setPlugins(List.of(new InstallablePlugin("analysis-icu")));
final PluginsConfig cachedConfig = new PluginsConfig();
cachedConfig.setPlugins(List.of(new InstallablePlugin("analysis-icu")));
final PluginChanges pluginChanges = action.getPluginChanges(config, Optional.of(cachedConfig));
assertThat(pluginChanges.isEmpty(), is(true));
}
/**
* Check that if an unofficial plugins' location has not changed in the cached config, then we
* calculate that the plugin does not need to be upgraded.

6
docs/changelog/115640.yaml Normal file
View file

@ -0,0 +1,6 @@
pr: 115640
summary: Fix NPE on plugin sync
area: Infra/CLI
type: bug
issues:
- 114818