honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-24 17:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove invalid use of XPackPlugin class (elastic/x-pack-elasticsearch#3700)

Browse Source 
Original commit: elastic/x-pack-elasticsearch@f4aabe1259
This commit is contained in:
Michael Basnight 2018-01-23 21:11:24 -06:00 committed by GitHub
parent c0790d6a49
commit 4475b718a4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/index/IndexAuditTrail.java
View File

@ -44,6 +44,7 @@ import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportMessage;
import org.elasticsearch.xpack.core.XPackClientPlugin;
import org.elasticsearch.xpack.core.XPackPlugin;
import org.elasticsearch.xpack.core.security.authc.AuthenticationToken;
import org.elasticsearch.xpack.core.security.index.IndexAuditTrailField;
@ -961,7 +962,7 @@ public class IndexAuditTrail extends AbstractComponent implements AuditTrail {
// method for testing to allow different plugins such as mock transport...
List<Class<? extends Plugin>> remoteTransportClientPlugins() {
return Arrays.asList(Security.class, XPackPlugin.class);
return Arrays.asList(XPackClientPlugin.class);
}
public static void registerSettings(List<Setting<?>> settings) {

9
plugin/security/src/test/java/org/elasticsearch/test/SettingsFilterTests.java
View File

@ -16,6 +16,7 @@ import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.common.settings.SettingsModule;
import org.elasticsearch.xpack.core.XPackPlugin;
import org.elasticsearch.xpack.core.XPackSettings;
import org.elasticsearch.xpack.security.LocalStateSecurity;
import org.elasticsearch.xpack.security.Security;
import org.hamcrest.Matcher;
@ -38,7 +39,7 @@ public class SettingsFilterTests extends ESTestCase {
private Map<String, Matcher> settingsMatcherMap = new HashMap<>();
private MockSecureSettings mockSecureSettings = new MockSecureSettings();
public void testFiltering() throws OperatorCreationException, GeneralSecurityException, DestroyFailedException, IOException {
public void testFiltering() throws Exception {
configureUnfilteredSetting("xpack.security.authc.realms.file.type", "file");
// ldap realm filtering
@ -103,17 +104,15 @@ public class SettingsFilterTests extends ESTestCase {
.setSecureSettings(mockSecureSettings)
.build();
XPackPlugin xPackPlugin = new XPackPlugin(settings, null);
Security securityPlugin = new Security(settings, null);
LocalStateSecurity securityPlugin = new LocalStateSecurity(settings, null);
List<Setting<?>> settingList = new ArrayList<>();
settingList.add(Setting.simpleString("foo.bar", Setting.Property.NodeScope));
settingList.add(Setting.simpleString("foo.baz", Setting.Property.NodeScope));
settingList.add(Setting.simpleString("bar.baz", Setting.Property.NodeScope));
settingList.add(Setting.simpleString("baz.foo", Setting.Property.NodeScope));
settingList.addAll(xPackPlugin.getSettings());
settingList.addAll(securityPlugin.getSettings());
List<String> settingsFilterList = new ArrayList<>();
settingsFilterList.addAll(xPackPlugin.getSettingsFilter());
settingsFilterList.addAll(securityPlugin.getSettingsFilter());
// custom settings, potentially added by a plugin
SettingsModule settingsModule = new SettingsModule(settings, settingList, settingsFilterList);