Writing some tests

jonathan-buttner · jonathan-buttner · commit 1748e6a6bf13 · 2025-01-21T17:05:28.000-05:00
diff --git a/docs/java-rest/low-level/configuration.asciidoc b/docs/java-rest/low-level/configuration.asciidoc
@@ -76,7 +76,7 @@ include-tagged::{doc-tests}/RestClientDocumentation.java[rest-client-config-disa
 ==== Elasticsearch Token Service tokens
 
 If you want the client to authenticate with an Elasticsearch access token, set the relevant HTTP request header.
-If the client makes requests on behalf of a single user only, you can set the necessary `ElasticInferenceServiceAuthorizationHandler` header as a default header as shown
+If the client makes requests on behalf of a single user only, you can set the necessary `Authorization` header as a default header as shown
 in the following example:
 
 ["source","java",subs="attributes,callouts,macros"]
@@ -87,7 +87,7 @@ include-tagged::{doc-tests}/RestClientDocumentation.java[rest-client-auth-bearer
 ==== Elasticsearch API keys
 
 If you want the client to authenticate with an Elasticsearch API key, set the relevant HTTP request header.
-If the client makes requests on behalf of a single user only, you can set the necessary `ElasticInferenceServiceAuthorizationHandler` header as a default header as shown
+If the client makes requests on behalf of a single user only, you can set the necessary `Authorization` header as a default header as shown
 in the following example:
 
 ["source","java",subs="attributes,callouts,macros"]
diff --git a/docs/reference/esql/esql-process-data-with-dissect-grok.asciidoc b/docs/reference/esql/esql-process-data-with-dissect-grok.asciidoc
@@ -178,7 +178,7 @@ include::{esql-specs}/docs.csv-spec[tag=dissectAppendWithOrderModifier-result]
 ====== Named skip key (`?`)
 include::../ingest/processors/dissect.asciidoc[tag=named-skip-key]
 This can be done with a named skip key using the `{?name}` syntax. In the
-following query, `ident` and `auth` are not added to the output table:
+following query, `ident` and `authorization` are not added to the output table:
 
 [source.merge.styled,esql]
 ----
diff --git a/docs/reference/rest-api/security/create-api-keys.asciidoc b/docs/reference/rest-api/security/create-api-keys.asciidoc
@@ -194,7 +194,7 @@ API key information.
 <4> API key credentials which is the Base64-encoding of the UTF-8
 representation of the `id` and `api_key` joined by a colon (`:`).
 
-To use the generated API key, send a request with an `ElasticInferenceServiceAuthorizationHandler` header that
+To use the generated API key, send a request with an `Authorization` header that
 contains an `ApiKey` prefix followed by the API key credentials
 (the `encoded` value from the response).
 
diff --git a/docs/reference/rest-api/security/get-tokens.asciidoc b/docs/reference/rest-api/security/get-tokens.asciidoc
@@ -155,7 +155,7 @@ seconds) that the token expires in, and the type:
 // TESTRESPONSE[s/superuser/_es_test_root/]
 
 The token returned by this API can be used by sending a request with an
-`ElasticInferenceServiceAuthorizationHandler` header with a value having the prefix "Bearer " followed
+`Authorization` header with a value having the prefix "Bearer " followed
 by the value of the `access_token`.
 
 [source,shell]
diff --git a/docs/reference/security/authentication/token-authentication-services.asciidoc b/docs/reference/security/authentication/token-authentication-services.asciidoc
@@ -40,7 +40,7 @@ generate access tokens and refresh tokens based on the OAuth2 specification.
 The access token is a short-lived token. By default, it expires after 20 minutes
 but it can be configured to last a maximum of 1 hour. It can be refreshed by
 using a refresh token, which has a lifetime of 24 hours. The access token is a
-bearer token. You can use it by sending a request with an `ElasticInferenceServiceAuthorizationHandler`
+bearer token. You can use it by sending a request with an `Authorization`
 header with a value that has the prefix "Bearer " followed by the value of the
 access token. For example:
 +
@@ -59,7 +59,7 @@ The API key service uses the
 By default, the API keys do not expire. When you make a request to create API
 keys, you can specify an expiration and permissions for the API key. The
 permissions are limited by the authenticated user's permissions. You can use the
-API key by sending a request with an `ElasticInferenceServiceAuthorizationHandler` header with a value that
+API key by sending a request with an `Authorization` header with a value that
 has the prefix "ApiKey " followed by the credentials. The credentials are the
 base64 encoding of the API key ID and the API key joined by a colon. For example:
 +
diff --git a/docs/reference/security/ccs-clients-integrations/http.asciidoc b/docs/reference/security/ccs-clients-integrations/http.asciidoc
@@ -65,7 +65,7 @@ es-secondary-authorization: Basic <TOKEN> <1>
 <1> The `<TOKEN>` is computed as `base64(USERNAME:PASSWORD)`
 
 The `es-secondary-authorization` header has the same syntax as the
-`ElasticInferenceServiceAuthorizationHandler` header. It therefore also supports the use of
+`Authorization` header. It therefore also supports the use of
 <<token-authentication-services,token-based authentication services>>. For
 example:
 
diff --git a/docs/reference/watcher/actions/email.asciidoc b/docs/reference/watcher/actions/email.asciidoc
@@ -149,9 +149,9 @@ killed by firewalls or load balancers in-between.
                     means, by default watcher tries to download a dashboard for 10 minutes,
                     forty times fifteen seconds). The setting `xpack.notification.reporting.interval`
                     can be configured globally to change the default.
-| `auth`          | Additional auth configuration for the request, see 
+| `authorization`          | Additional auth configuration for the request, see
                     {kibana-ref}/automating-report-generation.html#use-watcher[use watcher] for details
-| `proxy`         | Additional proxy configuration for the request. See <<http-input-attributes>> 
+| `proxy`         | Additional proxy configuration for the request. See <<http-input-attributes>>
                     on how to configure the values.
 |======
 
@@ -257,7 +257,7 @@ messages can contain basic HTML tags. You can control which groups of tags are
 allowed by <<email-html-sanitization, Configuring HTML Sanitization Options>>.
 
 You configure the accounts {watcher} can use to send email in the
-`xpack.notification.email` namespace in `elasticsearch.yml`. 
+`xpack.notification.email` namespace in `elasticsearch.yml`.
 The password for the specified SMTP user is stored securely in the
 <<secure-settings, {es} keystore>>.
 
diff --git a/docs/reference/watcher/actions/webhook.asciidoc b/docs/reference/watcher/actions/webhook.asciidoc
@@ -165,7 +165,7 @@ the values serve as the header values:
 | `params`              | no        | -           | The URL query string parameters. The parameter values can be
                                                     static text or include Mustache <<templates,templates>>.
 
-| `auth`                | no        | -           | Authentication related HTTP headers. Currently, only basic
+| `authorization`                | no        | -           | Authentication related HTTP headers. Currently, only basic
                                                     authentication is supported.
 
 | `body`                | no        | -           | The HTTP request body. The body can be static text or include
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java
@@ -114,6 +114,7 @@
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceService;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceComponents;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceSettings;
+import org.elasticsearch.xpack.inference.services.elastic.authorization.ElasticInferenceServiceAuthorizationHandler;
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElasticsearchInternalService;
 import org.elasticsearch.xpack.inference.services.googleaistudio.GoogleAiStudioService;
 import org.elasticsearch.xpack.inference.services.googlevertexai.GoogleVertexAiService;
@@ -286,13 +287,19 @@ public Collection<?> createComponents(PluginServices services) {
             String elasticInferenceUrl = this.getElasticInferenceServiceUrl(inferenceServiceSettings);
             elasticInferenceServiceComponents.set(new ElasticInferenceServiceComponents(elasticInferenceUrl));
 
+            var authorizationHandler = new ElasticInferenceServiceAuthorizationHandler(
+                elasticInferenceServiceComponents.get().elasticInferenceServiceUrl(),
+                services.threadPool()
+            );
+
             inferenceServices.add(
                 () -> List.of(
                     context -> new ElasticInferenceService(
                         elasicInferenceServiceFactory.get(),
                         serviceComponents.get(),
                         elasticInferenceServiceComponents.get(),
-                        modelRegistry
+                        modelRegistry,
+                        authorizationHandler
                     )
                 )
             );
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/retry/RetryingHttpSender.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/retry/RetryingHttpSender.java
@@ -35,7 +35,7 @@
 
 public class RetryingHttpSender implements RequestSender {
 
-    static final int MAX_RETIES = 3;
+    public static final int MAX_RETIES = 3;
 
     private final HttpClient httpClient;
     private final ThrottlerManager throttlerManager;
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/elastic/ElasticInferenceServiceAuthorizationRequest.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/elastic/ElasticInferenceServiceAuthorizationRequest.java
@@ -20,12 +20,12 @@
 import java.net.URISyntaxException;
 import java.util.Objects;
 
-public class ElasticInferenceServiceAuthRequest implements ElasticInferenceServiceRequest {
+public class ElasticInferenceServiceAuthorizationRequest implements ElasticInferenceServiceRequest {
 
     private final URI uri;
     private final TraceContextHandler traceContextHandler;
 
-    public ElasticInferenceServiceAuthRequest(String url, TraceContext traceContext) {
+    public ElasticInferenceServiceAuthorizationRequest(String url, TraceContext traceContext) {
         this.uri = createUri(Objects.requireNonNull(url));
         this.traceContextHandler = new TraceContextHandler(traceContext);
     }
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/elastic/ElasticInferenceServiceAuthorizationResponseEntity.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/elastic/ElasticInferenceServiceAuthorizationResponseEntity.java
@@ -36,7 +36,7 @@
 
 import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg;
 
-public class ElasticInferenceServiceAuthResponseEntity implements InferenceServiceResults {
+public class ElasticInferenceServiceAuthorizationResponseEntity implements InferenceServiceResults {
 
     public static final String NAME = "elastic_inference_service_auth_results";
     private static final Map<String, TaskType> ELASTIC_INFERENCE_SERVICE_TASK_TYPE_MAPPING = Map.of(
@@ -47,10 +47,11 @@ public class ElasticInferenceServiceAuthResponseEntity implements InferenceServi
     );
 
     @SuppressWarnings("unchecked")
-    public static ConstructingObjectParser<ElasticInferenceServiceAuthResponseEntity, Void> PARSER = new ConstructingObjectParser<>(
-        ElasticInferenceServiceAuthResponseEntity.class.getSimpleName(),
-        args -> new ElasticInferenceServiceAuthResponseEntity((List<AuthorizedModel>) args[0])
-    );
+    public static ConstructingObjectParser<ElasticInferenceServiceAuthorizationResponseEntity, Void> PARSER =
+        new ConstructingObjectParser<>(
+            ElasticInferenceServiceAuthorizationResponseEntity.class.getSimpleName(),
+            args -> new ElasticInferenceServiceAuthorizationResponseEntity((List<AuthorizedModel>) args[0])
+        );
 
     static {
         PARSER.declareObjectArray(constructorArg(), AuthorizedModel.ALLOWED_MODEL_PARSER::apply, new ParseField("models"));
@@ -106,22 +107,22 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     private final List<AuthorizedModel> allowedModels;
 
-    public ElasticInferenceServiceAuthResponseEntity(List<AuthorizedModel> allowedModels) {
+    public ElasticInferenceServiceAuthorizationResponseEntity(List<AuthorizedModel> allowedModels) {
         this.allowedModels = Objects.requireNonNull(allowedModels);
     }
 
     /**
      * Create an empty response
      */
-    public ElasticInferenceServiceAuthResponseEntity() {
+    public ElasticInferenceServiceAuthorizationResponseEntity() {
         this(List.of());
     }
 
-    public ElasticInferenceServiceAuthResponseEntity(StreamInput in) throws IOException {
+    public ElasticInferenceServiceAuthorizationResponseEntity(StreamInput in) throws IOException {
         this(in.readCollectionAsList(AuthorizedModel::new));
     }
 
-    public static ElasticInferenceServiceAuthResponseEntity fromResponse(Request request, HttpResult response) throws IOException {
+    public static ElasticInferenceServiceAuthorizationResponseEntity fromResponse(Request request, HttpResult response) throws IOException {
         var parserConfig = XContentParserConfiguration.EMPTY.withDeprecationHandler(LoggingDeprecationHandler.INSTANCE);
 
         try (XContentParser jsonParser = XContentFactory.xContent(XContentType.JSON).createParser(parserConfig, response.body())) {
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java
@@ -44,8 +44,8 @@
 import org.elasticsearch.xpack.inference.services.SenderService;
 import org.elasticsearch.xpack.inference.services.ServiceComponents;
 import org.elasticsearch.xpack.inference.services.ServiceUtils;
-import org.elasticsearch.xpack.inference.services.elastic.auth.ElasticInferenceServiceAuthorizationHandler;
-import org.elasticsearch.xpack.inference.services.elastic.auth.ElasticInferenceServiceAuthorization;
+import org.elasticsearch.xpack.inference.services.elastic.authorization.ElasticInferenceServiceAuthorization;
+import org.elasticsearch.xpack.inference.services.elastic.authorization.ElasticInferenceServiceAuthorizationHandler;
 import org.elasticsearch.xpack.inference.services.elastic.completion.ElasticInferenceServiceCompletionModel;
 import org.elasticsearch.xpack.inference.services.settings.RateLimitSettings;
 import org.elasticsearch.xpack.inference.telemetry.TraceContext;
@@ -86,66 +86,46 @@ public class ElasticInferenceService extends SenderService {
     private Configuration configuration;
     private EnumSet<TaskType> enabledTaskTypes;
     private final ModelRegistry modelRegistry;
+    private final ElasticInferenceServiceAuthorizationHandler authorizationHandler;
 
     public ElasticInferenceService(
         HttpRequestSender.Factory factory,
         ServiceComponents serviceComponents,
         ElasticInferenceServiceComponents elasticInferenceServiceComponents,
-        ModelRegistry modelRegistry
+        ModelRegistry modelRegistry,
+        ElasticInferenceServiceAuthorizationHandler authorizationHandler
     ) {
         super(factory, serviceComponents);
         this.elasticInferenceServiceComponents = Objects.requireNonNull(elasticInferenceServiceComponents);
         this.modelRegistry = Objects.requireNonNull(modelRegistry);
+        this.authorizationHandler = Objects.requireNonNull(authorizationHandler);
 
         enabledTaskTypes = EnumSet.noneOf(TaskType.class);
         configuration = new Configuration(enabledTaskTypes);
 
         getAuth();
     }
 
-    // TODO consider removing this should only be used for testing maybe mock getAcl instead?
-    ElasticInferenceService(
-        HttpRequestSender.Factory factory,
-        ServiceComponents serviceComponents,
-        ElasticInferenceServiceComponents elasticInferenceServiceComponents,
-        ModelRegistry modelRegistry,
-        ElasticInferenceServiceAuthorization auth
-    ) {
-        super(factory, serviceComponents);
-        this.elasticInferenceServiceComponents = Objects.requireNonNull(elasticInferenceServiceComponents);
-        this.modelRegistry = Objects.requireNonNull(modelRegistry);
-
-        setEnabledTaskTypes(auth);
-    }
-
     private void getAuth() {
         try {
-            ActionListener<ElasticInferenceServiceAuthorization> listener = ActionListener.wrap(
-                this::setEnabledTaskTypes,
-                e -> {
-                    // we don't need to do anything if there was a failure, everything is disabled by default
-                }
-            );
+            ActionListener<ElasticInferenceServiceAuthorization> listener = ActionListener.wrap(this::setEnabledTaskTypes, e -> {
+                // we don't need to do anything if there was a failure, everything is disabled by default
+            });
 
-            var auth = new ElasticInferenceServiceAuthorizationHandler(
-                elasticInferenceServiceComponents.elasticInferenceServiceUrl(),
-                getSender(),
-                getServiceComponents().threadPool()
-            );
-            auth.getAuth(listener);
+            authorizationHandler.getAuth(listener, getSender());
         } catch (Exception e) {
             // we don't need to do anything if there was a failure, everything is disabled by default
         }
     }
 
     private synchronized void setEnabledTaskTypes(ElasticInferenceServiceAuthorization auth) {
-        enabledTaskTypes = filterTaskTypesByAuth(auth);
+        enabledTaskTypes = filterTaskTypesByAuthorization(auth);
         configuration = new Configuration(enabledTaskTypes);
 
         defaultConfigIds().forEach(modelRegistry::addDefaultIds);
     }
 
-    private static EnumSet<TaskType> filterTaskTypesByAuth(ElasticInferenceServiceAuthorization auth) {
+    private static EnumSet<TaskType> filterTaskTypesByAuthorization(ElasticInferenceServiceAuthorization auth) {
         var implementedTaskTypes = EnumSet.copyOf(IMPLEMENTED_TASK_TYPES);
         implementedTaskTypes.retainAll(auth.enabledTaskTypes());
         return implementedTaskTypes;
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorization.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorization.java
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.inference.services.elastic.auth;
+package org.elasticsearch.xpack.inference.services.elastic.authorization;
 
 import org.elasticsearch.inference.TaskType;
-import org.elasticsearch.xpack.inference.external.response.elastic.ElasticInferenceServiceAuthResponseEntity;
+import org.elasticsearch.xpack.inference.external.response.elastic.ElasticInferenceServiceAuthorizationResponseEntity;
 
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -24,12 +24,12 @@
 public record ElasticInferenceServiceAuthorization(Map<String, EnumSet<TaskType>> enabledModels) {
 
     /**
-     * Converts an ACL response into the {@link ElasticInferenceServiceAuthorization} format.
+     * Converts an authorization response from EIS into the {@link ElasticInferenceServiceAuthorization} format.
      *
-     * @param responseEntity the response from the upstream gateway.
+     * @param responseEntity the {@link ElasticInferenceServiceAuthorizationResponseEntity} response from the upstream gateway.
      * @return a new {@link ElasticInferenceServiceAuthorization}
      */
-    public static ElasticInferenceServiceAuthorization of(ElasticInferenceServiceAuthResponseEntity responseEntity) {
+    public static ElasticInferenceServiceAuthorization of(ElasticInferenceServiceAuthorizationResponseEntity responseEntity) {
         var enabledModels = new HashMap<String, EnumSet<TaskType>>();
 
         for (var model : responseEntity.getAllowedModels()) {
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandler.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandler.java
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/http/sender/HttpRequestSenderTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/http/sender/HttpRequestSenderTests.java
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceTests.java
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationTests.java
