Starting integration tests

Author: jonathan-buttner

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/AuthorizationTaskExecutorIT.java

@@ -7,37 +7,44 @@
 
 package org.elasticsearch.xpack.inference.integration;
 
-import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.reindex.ReindexPlugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 import org.elasticsearch.test.http.MockWebServer;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.xpack.inference.LocalStateInferencePlugin;
 import org.elasticsearch.xpack.inference.registry.ModelRegistry;
+import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceSettings;
 import org.elasticsearch.xpack.inference.services.elastic.authorization.AuthorizationTaskExecutor;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 
+import java.io.IOException;
 import java.util.Collection;
 
 import static org.elasticsearch.xpack.inference.Utils.inferenceUtilityExecutors;
 import static org.elasticsearch.xpack.inference.external.http.Utils.getUrl;
 
 public class AuthorizationTaskExecutorIT extends ESSingleNodeTestCase {
 
+    private static final MockWebServer webServer = new MockWebServer();
+    private static String gatewayUrl;
+
     private ModelRegistry modelRegistry;
-    private final MockWebServer webServer = new MockWebServer();
     private ThreadPool threadPool;
-    private String gatewayUrl;
 
-    @Before
-    public void createComponents() throws Exception {
-        threadPool = createThreadPool(inferenceUtilityExecutors());
+    @BeforeClass
+    public static void initClass() throws IOException {
         webServer.start();
         gatewayUrl = getUrl(webServer);
+    }
+
+    @Before
+    public void createComponents() {
+        threadPool = createThreadPool(inferenceUtilityExecutors());
         modelRegistry = node().injector().getInstance(ModelRegistry.class);
-        node().injector().getInstance(ClusterState.class);
     }
 
     @After
@@ -47,8 +54,11 @@ public void shutdown() {
     }
 
     @Override
-    protected boolean resetNodeAfterTest() {
-        return true;
+    protected Settings nodeSettings() {
+        return Settings.builder()
+            .put(ElasticInferenceServiceSettings.ELASTIC_INFERENCE_SERVICE_URL.getKey(), gatewayUrl)
+            .put(ElasticInferenceServiceSettings.PERIODIC_AUTHORIZATION_ENABLED.getKey(), false)
+            .build();
     }
 
     @Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java

@@ -331,16 +331,13 @@ public Collection<?> createComponents(PluginServices services) {
             services.threadPool()
         );
 
-        var eisComponents = new ElasticInferenceServiceComponents(inferenceServiceSettings.getElasticInferenceServiceUrl());
-
         var authTaskExecutor = AuthorizationTaskExecutor.create(
             services.clusterService(),
             new AuthorizationPoller.Parameters(
                 serviceComponents.get(),
                 authorizationHandler,
                 elasticInferenceServiceFactory.get().createSender(),
                 inferenceServiceSettings,
-                eisComponents,
                 modelRegistry.get(),
                 services.client()
             )

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceSettings.java

@@ -28,7 +28,7 @@ public class ElasticInferenceServiceSettings {
     @Deprecated
     static final Setting<String> EIS_GATEWAY_URL = Setting.simpleString("xpack.inference.eis.gateway.url", Setting.Property.NodeScope);
 
-    static final Setting<String> ELASTIC_INFERENCE_SERVICE_URL = Setting.simpleString(
+    public static final Setting<String> ELASTIC_INFERENCE_SERVICE_URL = Setting.simpleString(
         "xpack.inference.elastic.url",
         Setting.Property.NodeScope
     );
@@ -37,7 +37,7 @@ public class ElasticInferenceServiceSettings {
      * This setting is for testing only. It controls whether authorization is only performed once at bootup. If set to true, an
      * authorization request will be made repeatedly on an interval.
      */
-    static final Setting<Boolean> PERIODIC_AUTHORIZATION_ENABLED = Setting.boolSetting(
+    public static final Setting<Boolean> PERIODIC_AUTHORIZATION_ENABLED = Setting.boolSetting(
         "xpack.inference.elastic.periodic_authorization_enabled",
         true,
         Setting.Property.NodeScope