From 067c2e0709dd431105e6814150ee3a6135c22ae3 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 31 Aug 2015 17:36:23 +0200 Subject: [PATCH] fix qa smoke tests Original commit: elastic/x-pack-elasticsearch@b3a2e0bc3870e00222a7482287749df17545eb5a --- .../java/org/elasticsearch/shield/RestIT.java | 10 ++++++++-- .../example/realm/CustomRealmIT.java | 16 +++++++++++----- .../smoketest/SmokeTestPluginsSslIT.java | 6 +++++- .../smoketest/SmokeTestPluginsIT.java | 8 +++++++- .../smoketest/WatcherWithShieldIT.java | 11 ++++++++--- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/qa/shield-core-rest-tests/src/test/java/org/elasticsearch/shield/RestIT.java b/qa/shield-core-rest-tests/src/test/java/org/elasticsearch/shield/RestIT.java index a0b1de402e0..608cb20ce1f 100644 --- a/qa/shield-core-rest-tests/src/test/java/org/elasticsearch/shield/RestIT.java +++ b/qa/shield-core-rest-tests/src/test/java/org/elasticsearch/shield/RestIT.java @@ -10,13 +10,15 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.elasticsearch.client.support.Headers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.shield.ShieldPlugin; +import org.elasticsearch.plugins.Plugin; import org.elasticsearch.shield.authc.support.SecuredString; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; +import java.util.Collection; +import java.util.Collections; import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue; @@ -46,9 +48,13 @@ public class RestIT extends ESRestTestCase { protected Settings externalClusterClientSettings() { return Settings.builder() .put("shield.user", USER + ":" + PASS) - .put("plugin.types", ShieldPlugin.class.getName()) .build(); } + @Override + protected Collection> transportClientPlugins() { + return Collections.>singleton(ShieldPlugin.class); + } + } diff --git a/qa/shield-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmIT.java b/qa/shield-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmIT.java index e2821e24d3e..5a2eb0fdc62 100644 --- a/qa/shield-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmIT.java +++ b/qa/shield-example-realm/src/test/java/org/elasticsearch/example/realm/CustomRealmIT.java @@ -13,11 +13,15 @@ import org.elasticsearch.client.transport.NoNodeAvailableException; import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; +import org.elasticsearch.plugins.Plugin; import org.elasticsearch.shield.ShieldPlugin; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.rest.client.http.HttpResponse; import org.junit.Test; +import java.util.Collection; +import java.util.Collections; + import static org.hamcrest.Matchers.*; /** @@ -28,12 +32,16 @@ public class CustomRealmIT extends ESIntegTestCase { @Override protected Settings externalClusterClientSettings() { return Settings.builder() - .put("plugin.types", ShieldPlugin.class.getName()) .put(Headers.PREFIX + "." + CustomRealm.USER_HEADER, CustomRealm.KNOWN_USER) .put(Headers.PREFIX + "." + CustomRealm.PW_HEADER, CustomRealm.KNOWN_PW) .build(); } + @Override + protected Collection> transportClientPlugins() { + return Collections.>singleton(ShieldPlugin.class); + } + @Test public void testHttpConnectionWithNoAuthentication() throws Exception { HttpResponse response = httpClient().path("/").execute(); @@ -61,12 +69,11 @@ public class CustomRealmIT extends ESIntegTestCase { Settings settings = Settings.builder() .put("path.home", createTempDir()) - .put("plugin.types", ShieldPlugin.class.getName()) .put("cluster.name", clusterName) .put(Headers.PREFIX + "." + CustomRealm.USER_HEADER, CustomRealm.KNOWN_USER) .put(Headers.PREFIX + "." + CustomRealm.PW_HEADER, CustomRealm.KNOWN_PW) .build(); - try (TransportClient client = TransportClient.builder().settings(settings).build()) { + try (TransportClient client = TransportClient.builder().settings(settings).addPlugin(ShieldPlugin.class).build()) { client.addTransportAddress(publishAddress); ClusterHealthResponse response = client.admin().cluster().prepareHealth().execute().actionGet(); assertThat(response.isTimedOut(), is(false)); @@ -83,12 +90,11 @@ public class CustomRealmIT extends ESIntegTestCase { Settings settings = Settings.builder() .put("path.home", createTempDir()) - .put("plugin.types", ShieldPlugin.class.getName()) .put("cluster.name", clusterName) .put(Headers.PREFIX + "." + CustomRealm.USER_HEADER, CustomRealm.KNOWN_USER + randomAsciiOfLength(1)) .put(Headers.PREFIX + "." + CustomRealm.PW_HEADER, CustomRealm.KNOWN_PW) .build(); - try (TransportClient client = TransportClient.builder().settings(settings).build()) { + try (TransportClient client = TransportClient.builder().addPlugin(ShieldPlugin.class).settings(settings).build()) { client.addTransportAddress(publishAddress); client.admin().cluster().prepareHealth().execute().actionGet(); fail("authentication failure should have resulted in a NoNodesAvailableException"); diff --git a/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsSslIT.java b/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsSslIT.java index 79707388cff..65ad838e67e 100644 --- a/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsSslIT.java +++ b/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsSslIT.java @@ -80,8 +80,12 @@ public class SmokeTestPluginsSslIT extends ESRestTestCase { .put("shield.transport.ssl", true) .put("shield.ssl.keystore.path", keyStore) .put("shield.ssl.keystore.password", KEYSTORE_PASS) - .put("plugin.types", ShieldPlugin.class.getName()) .build(); } + @Override + protected Collection> transportClientPlugins() { + return Collections.>singleton(ShieldPlugin.class); + } + } diff --git a/qa/smoke-test-plugins/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsIT.java b/qa/smoke-test-plugins/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsIT.java index ebaef4ba102..edf0edc1252 100644 --- a/qa/smoke-test-plugins/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsIT.java +++ b/qa/smoke-test-plugins/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsIT.java @@ -10,6 +10,7 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.elasticsearch.client.support.Headers; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.plugins.Plugin; import org.elasticsearch.shield.ShieldPlugin; import org.elasticsearch.shield.authc.support.SecuredString; import org.elasticsearch.test.rest.ESRestTestCase; @@ -17,6 +18,8 @@ import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; +import java.util.Collection; +import java.util.Collections; import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue; @@ -46,9 +49,12 @@ public class SmokeTestPluginsIT extends ESRestTestCase { protected Settings externalClusterClientSettings() { return Settings.builder() .put("shield.user", USER + ":" + PASS) - .put("plugin.types", ShieldPlugin.class.getName()) .build(); } + @Override + protected Collection> transportClientPlugins() { + return Collections.>singleton(ShieldPlugin.class); + } } diff --git a/qa/smoke-test-watcher-with-shield/src/test/java/org/elasticsearch/smoketest/WatcherWithShieldIT.java b/qa/smoke-test-watcher-with-shield/src/test/java/org/elasticsearch/smoketest/WatcherWithShieldIT.java index c8363c3f70e..3c5022f7b34 100644 --- a/qa/smoke-test-watcher-with-shield/src/test/java/org/elasticsearch/smoketest/WatcherWithShieldIT.java +++ b/qa/smoke-test-watcher-with-shield/src/test/java/org/elasticsearch/smoketest/WatcherWithShieldIT.java @@ -14,20 +14,21 @@ import org.apache.http.impl.conn.BasicHttpClientConnectionManager; import org.elasticsearch.client.support.Headers; import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.license.plugin.LicensePlugin; +import org.elasticsearch.plugins.Plugin; import org.elasticsearch.shield.ShieldPlugin; import org.elasticsearch.shield.authc.support.SecuredString; import org.elasticsearch.shield.authc.support.UsernamePasswordToken; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; -import org.elasticsearch.watcher.WatcherPlugin; import org.junit.After; import org.junit.Before; import java.io.IOException; import java.net.InetSocketAddress; import java.net.URI; +import java.util.Collection; +import java.util.Collections; import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue; @@ -80,7 +81,6 @@ public class WatcherWithShieldIT extends ESRestTestCase { protected Settings externalClusterClientSettings() { return Settings.builder() .put("shield.user", TEST_ADMIN_USERNAME + ":" + TEST_ADMIN_PASSWORD) - .put("plugin.types", WatcherPlugin.class.getName() + "," + ShieldPlugin.class.getName() + "," + LicensePlugin.class.getName()) .build(); } @@ -88,5 +88,10 @@ public class WatcherWithShieldIT extends ESRestTestCase { return new String[]{"watcher_manager", "changeme"}; } + @Override + protected Collection> transportClientPlugins() { + return Collections.>singleton(ShieldPlugin.class); + } + }