From 72bb09903a526fbad735aae73b0298781a79733b Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 11 May 2023 12:49:46 -0400 Subject: [PATCH] Run spotlessApply Signed-off-by: Craig Perkins --- CHANGELOG.md | 3 ++- .../opensearch/extensions/ExtensionsManager.java | 9 +++++++-- .../opensearch/extensions/ExtensionsSettings.java | 2 -- .../extensions/NoopExtensionsManager.java | 1 - .../java/org/opensearch/plugins/IdentityPlugin.java | 3 --- .../ExtensionsManagerWithIdentityTests.java | 13 ++++++++----- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffe72c402db8f..ed16315ff9149 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Add events correlation engine plugin ([#6854](https://github.com/opensearch-project/OpenSearch/issues/6854)) - Add connectToNodeAsExtension in TransportService ([#6866](https://github.com/opensearch-project/OpenSearch/pull/6866)) - Adds ExtensionsManager.lookupExtensionSettingsById ([#7466](https://github.com/opensearch-project/OpenSearch/pull/7466)) +- [Extensions] Allow IdentityPlugin to add settings for extensions/extensions.yml ([#7526](https://github.com/opensearch-project/OpenSearch/pull/7526)) ### Dependencies - Bump `log4j-core` from 2.18.0 to 2.19.0 @@ -120,4 +121,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Security [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD -[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.7...2.x \ No newline at end of file +[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.7...2.x diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java index 9b8c8029a205b..6239ee28cd237 100644 --- a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java +++ b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java @@ -662,8 +662,13 @@ private ExtensionsSettings readFromExtensionsYml(Path filePath) throws IOExcepti ExtensionAdditionalSettings additionalSettings = new ExtensionAdditionalSettings(Set.of()); if (identityService != null) { - additionalSettings = new ExtensionAdditionalSettings(identityService.getExtensionSettings().stream().collect(Collectors.toSet())); - Set securitySettingsKeys = identityService.getExtensionSettings().stream().map(s -> s.getKey()).collect(Collectors.toSet()); + additionalSettings = new ExtensionAdditionalSettings( + identityService.getExtensionSettings().stream().collect(Collectors.toSet()) + ); + Set securitySettingsKeys = identityService.getExtensionSettings() + .stream() + .map(s -> s.getKey()) + .collect(Collectors.toSet()); Map securitySettings = extensionMap.entrySet() .stream() .filter(kv -> securitySettingsKeys.contains(kv.getKey())) diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsSettings.java b/server/src/main/java/org/opensearch/extensions/ExtensionsSettings.java index 2c59031aa27b9..4b566e0cf45aa 100644 --- a/server/src/main/java/org/opensearch/extensions/ExtensionsSettings.java +++ b/server/src/main/java/org/opensearch/extensions/ExtensionsSettings.java @@ -8,8 +8,6 @@ package org.opensearch.extensions; -import org.opensearch.common.settings.Settings; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/org/opensearch/extensions/NoopExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/NoopExtensionsManager.java index 7f64d2f0ce503..6165423b767ce 100644 --- a/server/src/main/java/org/opensearch/extensions/NoopExtensionsManager.java +++ b/server/src/main/java/org/opensearch/extensions/NoopExtensionsManager.java @@ -22,7 +22,6 @@ import org.opensearch.extensions.action.ExtensionActionRequest; import org.opensearch.extensions.action.ExtensionActionResponse; import org.opensearch.extensions.action.RemoteExtensionActionResponse; -import org.opensearch.identity.IdentityService; import org.opensearch.index.IndexModule; import org.opensearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/plugins/IdentityPlugin.java b/server/src/main/java/org/opensearch/plugins/IdentityPlugin.java index 7ac714359b540..b838d94bee18a 100644 --- a/server/src/main/java/org/opensearch/plugins/IdentityPlugin.java +++ b/server/src/main/java/org/opensearch/plugins/IdentityPlugin.java @@ -9,13 +9,10 @@ package org.opensearch.plugins; import org.opensearch.common.settings.Setting; -import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.identity.Subject; -import org.opensearch.rest.RestHandler; import java.util.Collections; import java.util.List; -import java.util.function.UnaryOperator; /** * Plugin that provides identity and access control for OpenSearch diff --git a/server/src/test/java/org/opensearch/extensions/ExtensionsManagerWithIdentityTests.java b/server/src/test/java/org/opensearch/extensions/ExtensionsManagerWithIdentityTests.java index 61386df1a3832..261dcf9eebcba 100644 --- a/server/src/test/java/org/opensearch/extensions/ExtensionsManagerWithIdentityTests.java +++ b/server/src/test/java/org/opensearch/extensions/ExtensionsManagerWithIdentityTests.java @@ -56,10 +56,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.opensearch.test.ClusterServiceUtils.createClusterService; @@ -227,9 +224,15 @@ public void testAdditionalExtensionSettings() throws Exception { assertEquals(extension.getDependencies(), initializedExtension.getDependencies()); assertTrue(extensionsManager.lookupExtensionSettingsById(extension.getId()).isPresent()); if ("firstExtension".equals(extension.getName())) { - assertEquals("custom_setting", extensionsManager.lookupExtensionSettingsById(extension.getId()).get().getAdditionalSettings().get(customSetting)); + assertEquals( + "custom_setting", + extensionsManager.lookupExtensionSettingsById(extension.getId()).get().getAdditionalSettings().get(customSetting) + ); } else if ("secondExtension".equals(extension.getName())) { - assertEquals("none", extensionsManager.lookupExtensionSettingsById(extension.getId()).get().getAdditionalSettings().get(customSetting)); + assertEquals( + "none", + extensionsManager.lookupExtensionSettingsById(extension.getId()).get().getAdditionalSettings().get(customSetting) + ); } } }